diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
index b90ca7c3e2..adcb94176c 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java
@@ -64,7 +64,7 @@ public class Resolver {
   private final @Nonnull PolarisMetaStoreManager polarisMetaStoreManager;
 
   // the cache of entities
-  private final EntityCache cache;
+  @Nullable private final EntityCache cache;
 
   // the id of the principal making the call or 0 if unknown
   private final @Nonnull AuthenticatedPolarisPrincipal polarisPrincipal;
diff --git a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java
index 70e262c432..6ec24ac422 100644
--- a/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java
+++ b/quarkus/service/src/main/java/org/apache/polaris/service/quarkus/config/QuarkusProducers.java
@@ -44,7 +44,6 @@
 import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisEntityManager;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.cache.EntityCache;
 import org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
 import org.apache.polaris.core.storage.cache.StorageCredentialCache;
 import org.apache.polaris.service.auth.ActiveRolesProvider;
@@ -52,6 +51,7 @@
 import org.apache.polaris.service.auth.TokenBrokerFactory;
 import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService;
 import org.apache.polaris.service.catalog.io.FileIOFactory;
+import org.apache.polaris.service.config.RealmEntityManagerFactory;
 import org.apache.polaris.service.context.RealmContextConfiguration;
 import org.apache.polaris.service.context.RealmContextFilter;
 import org.apache.polaris.service.context.RealmContextResolver;
@@ -211,13 +211,6 @@ public ManagedExecutor taskExecutor(TaskHandlerConfiguration config) {
         .build();
   }
 
-  @Produces
-  @RequestScoped
-  public EntityCache entityCache(
-      RealmContext realmContext, MetaStoreManagerFactory metaStoreManagerFactory) {
-    return metaStoreManagerFactory.getOrCreateEntityCache(realmContext);
-  }
-
   @Produces
   @RequestScoped
   public PolarisMetaStoreManager polarisMetaStoreManager(
@@ -235,10 +228,8 @@ public TransactionalPersistence polarisMetaStoreSession(
   @Produces
   @RequestScoped
   public PolarisEntityManager polarisEntityManager(
-      PolarisMetaStoreManager polarisMetaStoreManager,
-      StorageCredentialCache credentialCache,
-      EntityCache entityCache) {
-    return new PolarisEntityManager(polarisMetaStoreManager, credentialCache, entityCache);
+      RealmContext realmContext, RealmEntityManagerFactory factory) {
+    return factory.getOrCreateEntityManager(realmContext);
   }
 
   @Produces