diff --git a/extensions/pom.xml b/extensions/pom.xml
index 874155d759..d84fa7ce8c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -451,6 +451,24 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>c3p0</groupId>
+      <artifactId>c3p0</artifactId>
+      <version>0.9.1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
+      <version>${javax.persistence-api.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>2.0.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
diff --git a/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerIT.java b/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerIT.java
index b000d07405..b8df7270a0 100644
--- a/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerIT.java
+++ b/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerIT.java
@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License for more details.
  *
  *
- * Copyright (c) 2002-2018 Hitachi Vantara. All rights reserved.
+ * Copyright (c) 2002-2024 Hitachi Vantara. All rights reserved.
  *
  */
 
@@ -52,8 +52,6 @@ public String getSolutionPath() {
     }
   }
 
-  // private final StringBuffer longString = new StringBuffer();
-
   public void testCache() {
 
     // Make sure we have a cache first...
diff --git a/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerWithRegionIT.java b/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerWithRegionIT.java
index 1798759ce0..2c39959d08 100644
--- a/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerWithRegionIT.java
+++ b/extensions/src/it/java/org/pentaho/test/platform/plugin/services/cache/CacheManagerWithRegionIT.java
@@ -14,7 +14,7 @@
  * See the GNU Lesser General Public License for more details.
  *
  *
- * Copyright (c) 2002-2018 Hitachi Vantara. All rights reserved.
+ * Copyright (c) 2002-2024 Hitachi Vantara. All rights reserved.
  *
  */
 
diff --git a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java
index 32132980e3..7807b69588 100644
--- a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java
+++ b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java
@@ -320,7 +320,6 @@ public void clearRegionCache( String region ) {
         try {
           try ( SessionImpl session = (SessionImpl) cache.getSessionFactory().openSession() ) {
             cache.getStorageAccess().clearCache( session );
-            cache.evictAll();
           }
         } catch ( CacheException e ) {
           CacheManager.logger.error( Messages.getInstance().getString(
@@ -425,7 +424,7 @@ public void clearCache() {
         String key = ( entry.getKey() != null ) ? entry.getKey().toString() : ""; //$NON-NLS-1$
         if ( key != null ) {
           Cache cache = regionCache.get( key );
-          cache.evictAll();
+          removeRegionCache( key );
         }
       }
     }
@@ -450,7 +449,9 @@ public void killSessionCache( IPentahoSession session ) {
           while ( it.hasNext() ) {
             String key = (String) it.next();
             if ( key.indexOf( session.getId() ) >= 0 ) {
-              hvcache.evictEntityData( key );
+              try ( SessionImpl hibSession = (SessionImpl) hvcache.getSessionFactory().openSession() ) {
+                hvcache.getStorageAccess().removeFromCache( key, hibSession );
+              }
             }
           }
         }
diff --git a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/LastModifiedCache.java b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/LastModifiedCache.java
index ecbb121b91..d369ad62ff 100644
--- a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/LastModifiedCache.java
+++ b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/LastModifiedCache.java
@@ -141,7 +141,7 @@ protected void setLastModified() {
   }
 
   @Override public void evictEntityData() {
-    sessionFactory.getMetamodel().entityPersisters().values().forEach( this::evictEntityData );
+    throwNotImplemented();
   }
 
   @Override
diff --git a/extensions/src/test/resources/cache-solution/system/hibernate/hibernate-settings.xml b/extensions/src/test/resources/cache-solution/system/hibernate/hibernate-settings.xml
new file mode 100644
index 0000000000..855ee61992
--- /dev/null
+++ b/extensions/src/test/resources/cache-solution/system/hibernate/hibernate-settings.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='utf-8'?>
+<settings>
+  <!--
+  * This setting allows the deployment to specify where to find the
+  * database-specific hibernate configuration. The samples supplied
+  * include the following:
+  *
+  * system/hibernate/hsql.hibernate.cfg.xml
+  * system/hibernate/mysql5.hibernate.cfg.xml
+  * system/hibernate/postgresql.hibernate.cfg.xml
+  * system/hibernate/oracle10g.hibernate.cfg.xml
+  *
+  -->
+  <!-- DEV TESTING ONLY -->
+  <config-file>system/hibernate/postgresql.hibernate.cfg.xml</config-file>
+
+  <!--
+  *
+  * managed should be set to true if running the BI Platform
+  * in a managed environment (like JBoss, Orion, etc). In this configuration,
+  * you should specify another location for the hibernate.cfg.xml (see below)
+  * instead of simply using the default one provided. This setting essentially
+  * tells the HibernateUtil class to use JNDI to locate the factory class for
+  * getting sessions. This allows the platform to use Hibernate across boundaries
+  * in message beans (for example).
+  *
+    <managed>false</managed>
+  -->
+
+  <managed>false</managed>
+</settings>
\ No newline at end of file