diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
index c7c9b413e..28ff22780 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java
@@ -1,5 +1,6 @@
 package io.ebean.cache;
 
+import io.avaje.lang.Nullable;
 import io.ebean.meta.MetricVisitor;
 
 import java.util.LinkedHashMap;
@@ -68,36 +69,27 @@ public interface ServerCache {
   /**
    * Return the number of entries in the cache.
    */
-  int size();
+  default int size() {
+    return 0;
+  }
 
   /**
    * Return the hit ratio the cache is currently getting.
    */
   default int hitRatio() {
-    return getHitRatio();
+    return 0;
   }
 
-  /**
-   * Deprecated migrate to hitRatio().
-   */
-  @Deprecated
-  int getHitRatio();
-
   /**
    * Return statistics for the cache.
    *
    * @param reset if true the statistics are reset.
    */
+  @Nullable
   default ServerCacheStatistics statistics(boolean reset) {
-    return getStatistics(reset);
+    return null;
   }
 
-  /**
-   * Deprecated migrate to statistics().
-   */
-  @Deprecated
-  ServerCacheStatistics getStatistics(boolean reset);
-
   /**
    * Visit the metrics for the cache.
    */
@@ -108,6 +100,7 @@ public interface ServerCache {
   /**
    * Unwrap the underlying ServerCache.
    */
+  @SuppressWarnings("unchecked")
   default <T> T unwrap(Class<T> cls) {
     return (T) this;
   }
diff --git a/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java b/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java
index 1a4e2f3d0..42e22a950 100644
--- a/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java
+++ b/ebean-api/src/main/java/io/ebean/cache/TenantAwareCache.java
@@ -69,13 +69,13 @@ public final class TenantAwareCache implements ServerCache {
   }
 
   @Override
-  public int getHitRatio() {
-    return delegate.getHitRatio();
+  public int hitRatio() {
+    return delegate.hitRatio();
   }
 
   @Override
-  public ServerCacheStatistics getStatistics(boolean reset) {
-    return delegate.getStatistics(reset);
+  public ServerCacheStatistics statistics(boolean reset) {
+    return delegate.statistics(reset);
   }
 
   @Override
diff --git a/ebean-api/src/test/java/io/ebean/cache/TenantAwareCacheTest.java b/ebean-api/src/test/java/io/ebean/cache/TenantAwareCacheTest.java
index 6d8bdd92c..4bffa2d00 100644
--- a/ebean-api/src/test/java/io/ebean/cache/TenantAwareCacheTest.java
+++ b/ebean-api/src/test/java/io/ebean/cache/TenantAwareCacheTest.java
@@ -45,7 +45,7 @@ class TenantAwareCacheTest {
 
   @Test
   void putAll_getAll_removeAll() {
-    Map<Object,Object> map = new HashMap<>();
+    Map<Object, Object> map = new HashMap<>();
     map.put("A", "a");
     map.put("B", "b");
     map.put("C", "c");
@@ -109,14 +109,5 @@ class TenantAwareCacheTest {
       return map.size();
     }
 
-    @Override
-    public int getHitRatio() {
-      return 0;
-    }
-
-    @Override
-    public ServerCacheStatistics getStatistics(boolean reset) {
-      return null;
-    }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index d3f3ded46..ae3a297b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -85,7 +85,7 @@ public class DefaultServerCache implements ServerCache {
   }
 
   @Override
-  public ServerCacheStatistics getStatistics(boolean reset) {
+  public ServerCacheStatistics statistics(boolean reset) {
     ServerCacheStatistics cacheStats = new ServerCacheStatistics();
     cacheStats.setCacheName(name);
     cacheStats.setMaxSize(maxSize);
@@ -114,7 +114,7 @@ public class DefaultServerCache implements ServerCache {
   }
 
   @Override
-  public int getHitRatio() {
+  public int hitRatio() {
     long mc = missCount.get(false);
     long hc = hitCount.get(false);
     long totalCount = hc + mc;
diff --git a/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
index 819d0f3f1..648d0bc3a 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/DuelCache.java
@@ -141,18 +141,4 @@ public final class DuelCache implements ServerCache, NearCacheInvalidate {
     return remote.getMissCount();
   }
 
-  @Override
-  public int size() {
-    return 0;
-  }
-
-  @Override
-  public int getHitRatio() {
-    return 0;
-  }
-
-  @Override
-  public ServerCacheStatistics getStatistics(boolean reset) {
-    return null;
-  }
 }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index a9ce387f1..83633aaeb 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -277,17 +277,7 @@ final class RedisCache implements ServerCache {
   }
 
   @Override
-  public int size() {
-    return 0;
-  }
-
-  @Override
-  public int getHitRatio() {
-    return 0;
-  }
-
-  @Override
-  public ServerCacheStatistics getStatistics(boolean reset) {
+  public ServerCacheStatistics statistics(boolean reset) {
     ServerCacheStatistics cacheStats = new ServerCacheStatistics();
     cacheStats.setCacheName(cacheKey);
     cacheStats.setHitCount(hitCount.get(reset));