diff --git a/assemblies/pentaho-war/pom.xml b/assemblies/pentaho-war/pom.xml
index fda88cbb6af..50a94546bcc 100644
--- a/assemblies/pentaho-war/pom.xml
+++ b/assemblies/pentaho-war/pom.xml
@@ -840,6 +840,12 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-ehcache</artifactId>
       <version>${hibernate-ehcache.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.yaml</groupId>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 295bab0de62..a6ec3259ac2 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -1005,12 +1005,24 @@
       <artifactId>classic-core</artifactId>
       <version>${pentaho-reporting.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.pentaho.reporting.engine</groupId>
       <artifactId>classic-extensions</artifactId>
       <version>${pentaho-reporting.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.pentaho.reporting.engine</groupId>
@@ -1024,17 +1036,41 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-core</artifactId>
+      <version>${ehcache-core.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.pentaho.reporting.engine</groupId>
       <artifactId>classic-extensions-mondrian</artifactId>
       <version>${pentaho-reporting.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.pentaho.reporting.engine</groupId>
       <artifactId>classic-extensions-olap4j</artifactId>
       <version>${pentaho-reporting.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>*</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.pentaho.reporting.engine</groupId>
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 7807b695889..60e604c3d35 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
@@ -513,13 +513,18 @@ public long getElementCountInRegionCache( String region ) {
       Ehcache ehcache = hvcache.getStorageAccess().getCache();
       if ( hvcache != null ) {
         try {
-          CacheStatistics cacheStatistics = new CacheStatistics( ehcache );
-          return cacheStatistics.getMemoryStoreObjectCount() + cacheStatistics.getDiskStoreObjectCount();
+          long memCnt = ehcache.getStatistics().getMemoryStoreObjectCount();
+          long discCnt = ehcache.getStatistics().getDiskStoreObjectCount();
+          return memCnt + discCnt;
         } catch ( Exception ignored ) {
+          return -1;
         }
+      } else {
+        return -1;
       }
+    } else {
+      return -1;
     }
-    return -1;
   }
 
   @Override
diff --git a/pom.xml b/pom.xml
index 0429e9f3bb3..77539ad13fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
     <url>https://github.com/pentaho/pentaho-platform</url>
   </scm>
   <properties>
+    <ehcache-core.version>2.5.1</ehcache-core.version>
     <urlrewrite.version>3.2.0</urlrewrite.version>
     <jsr305.version>1.3.9</jsr305.version>
     <aopalliance.version>1.0</aopalliance.version>
diff --git a/repository/pom.xml b/repository/pom.xml
index a3f36cb2954..7364a57187c 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -783,12 +783,6 @@
       <artifactId>org.osgi.core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-ehcache</artifactId>
-      <version>${hibernate-ehcache.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>pentaho</groupId>
       <artifactId>pentaho-platform-core</artifactId>