1 files changed, 6 insertions, 12 deletions
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
index 91a3181cb68..612eb8bb8e0 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
@@ -29,6 +29,7 @@ import com.yahoo.messagebus.shared.SharedMessageBus;
 import com.yahoo.messagebus.shared.SharedSourceSession;
 import com.yahoo.vespa.config.content.DistributionConfig;
 import com.yahoo.vespa.config.content.LoadTypeConfig;
+import com.yahoo.yolean.concurrent.Memoized;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,8 +56,7 @@ public final class SessionCache extends AbstractComponent {
     private static final Logger log = Logger.getLogger(SessionCache.class.getName());
 
     private final Object monitor = new Object();
-    private Supplier<SharedMessageBus> messageBuses;
-    private SharedMessageBus messageBus;
+    private Memoized<SharedMessageBus, RuntimeException> messageBus;
 
     private final Object intermediateLock = new Object();
     private final Map<String, SharedIntermediateSession> intermediates = new HashMap<>();
@@ -96,24 +96,18 @@ public final class SessionCache extends AbstractComponent {
 
     public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig,
                         MessagebusConfig messagebusConfig, Protocol protocol) {
-        this.messageBuses = () -> createSharedMessageBus(net.get(), containerMbusConfig, messagebusConfig, protocol);
+        this.messageBus = new Memoized<>(() -> createSharedMessageBus(net.get(), containerMbusConfig, messagebusConfig, protocol),
+                                         SharedMessageBus::release);
     }
 
     @Override
     public void deconstruct() {
-        synchronized (monitor) {
-            messageBuses = () -> { throw new IllegalStateException("Session cache already deconstructed"); };
-
-            if (messageBus != null)
-                messageBus.release();
-        }
+        messageBus.close();
     }
 
     // Lazily create shared message bus.
     private SharedMessageBus bus() {
-        synchronized (monitor) {
-            return messageBus = messageBus != null ? messageBus : messageBuses.get();
-        }
+        return messageBus.get();
     }
 
     private static SharedMessageBus createSharedMessageBus(NetworkMultiplexer net,