diff --git a/common/tls/pom.xml b/common/tls/pom.xml
index 478f8804096..932bbca54e7 100644
--- a/common/tls/pom.xml
+++ b/common/tls/pom.xml
@@ -71,6 +71,11 @@
hamcrest-all
test
+
+ org.mockito
+ mockito-core
+ test
+
diff --git a/common/tls/src/main/java/io/helidon/common/tls/ConfiguredTlsManager.java b/common/tls/src/main/java/io/helidon/common/tls/ConfiguredTlsManager.java
index 16ac897a094..cbe75e8444e 100644
--- a/common/tls/src/main/java/io/helidon/common/tls/ConfiguredTlsManager.java
+++ b/common/tls/src/main/java/io/helidon/common/tls/ConfiguredTlsManager.java
@@ -124,6 +124,14 @@ protected void reload(Optional keyManager, Optional CACHE = new ConcurrentHashMap<>();
+
+ private TlsManagerCache() {
+ }
+
+ static TlsManager getOrCreate(Object configBean,
+ Function