diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java
index c9603ada6..619a6ecc2 100644
--- a/ebean-api/src/main/java/io/ebean/DB.java
+++ b/ebean-api/src/main/java/io/ebean/DB.java
@@ -1246,7 +1246,7 @@ public final class DB {
    * Return the manager of the level 2 cache ("L2" cache).
    */
   public static ServerCacheManager getServerCacheManager() {
-    return getDefault().getServerCacheManager();
+    return getDefault().cacheManager();
   }
 
   /**
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index c11e0cedc..be89f86c2 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -1495,7 +1495,15 @@ public interface Database {
   /**
    * Return the manager of the server cache ("L2" cache).
    */
-  ServerCacheManager getServerCacheManager();
+  ServerCacheManager cacheManager();
+
+  /**
+   * Deprecated migrate to cacheManager().
+   */
+  @Deprecated
+  default ServerCacheManager getServerCacheManager() {
+    return cacheManager();
+  }
 
   /**
    * Return the BackgroundExecutor service for asynchronous processing of
diff --git a/ebean-api/src/main/java/io/ebean/Ebean.java b/ebean-api/src/main/java/io/ebean/Ebean.java
index 7dc6cd308..5756a18bf 100644
--- a/ebean-api/src/main/java/io/ebean/Ebean.java
+++ b/ebean-api/src/main/java/io/ebean/Ebean.java
@@ -1208,7 +1208,7 @@ public final class Ebean {
    * Return the manager of the server cache ("L2" cache).
    */
   public static ServerCacheManager getServerCacheManager() {
-    return getDefault().getServerCacheManager();
+    return getDefault().cacheManager();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index df7a32beb..0cee2236b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -538,7 +538,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public ServerCacheManager getServerCacheManager() {
+  public ServerCacheManager cacheManager() {
     return serverCacheManager;
   }
 
diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
index f771d7ab1..dd3c949f9 100644
--- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
@@ -78,7 +78,7 @@ public abstract class BaseTestCase {
   }
 
   protected void clearAllL2Cache() {
-    server().getServerCacheManager().clearAll();
+    server().cacheManager().clearAll();
   }
 
   protected void resetAllMetrics() {
@@ -242,7 +242,7 @@ public abstract class BaseTestCase {
   }
 
   protected <T> ServerCacheStatistics getBeanCacheStats(Class<T> cls, boolean reset) {
-    return server().getServerCacheManager().getBeanCache(cls).getStatistics(reset);
+    return server().cacheManager().getBeanCache(cls).getStatistics(reset);
   }
 
   protected Platform platform() {
diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java
index 337a80116..beaa1b31f 100644
--- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java
+++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java
@@ -12,7 +12,7 @@ public class ServerCacheManagerTest {
   @Test
   public void test() {
 
-    ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager();
+    ServerCacheManager cacheManager = DB.getDefault().cacheManager();
 
     for (ServerCacheRegion region : cacheManager.allRegions()) {
       assertTrue(region.isEnabled());
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 1e52c263e..648744ca8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -919,7 +919,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public ServerCacheManager getServerCacheManager() {
+  public ServerCacheManager cacheManager() {
     return null;
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
index 7416ca58b..ad5a4e1a6 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java
@@ -43,7 +43,7 @@ public class JdbcTransactionTest {
   @Test
   public void skipCacheAfterSave() {
 
-    ServerCacheManager cacheManager = DB.getDefault().getServerCacheManager();
+    ServerCacheManager cacheManager = DB.getDefault().cacheManager();
     ServerCache customerBeanCache = cacheManager.getBeanCache(Customer.class);
     ServerCache contactNatKeyCache = cacheManager.getNaturalKeyCache(Contact.class);
 
diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
index 6e8208409..06ef39bdf 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
@@ -30,7 +30,7 @@ public class TestQueryWithCache extends BaseTestCase {
     assertTrue(cacheOptions.isReadOnly());
     assertTrue(beanDescriptor.isCacheSharableBeans());
 
-    ServerCacheManager serverCacheManager = server.getServerCacheManager();
+    ServerCacheManager serverCacheManager = server.cacheManager();
     serverCacheManager.clear(Country.class);
 
     ServerCache beanCache = serverCacheManager.getBeanCache(Country.class);
diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
index 2869b2121..3d78cd137 100644
--- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
+++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class TestBatchLazyWithCacheHits extends BaseTestCase {
 
-  private final ServerCache beanCache = server().getServerCacheManager().getBeanCache(UUOne.class);
+  private final ServerCache beanCache = server().cacheManager().getBeanCache(UUOne.class);
 
   private UUOne insert(String name) {
     UUOne one = new UUOne();
diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java
index 99e40879d..280848b95 100644
--- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java
+++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java
@@ -27,7 +27,7 @@ public class TestBeanCache extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(TestBeanCache.class);
 
-  private final ServerCache beanCache = DB.getDefault().getServerCacheManager().getBeanCache(OCachedBean.class);
+  private final ServerCache beanCache = DB.getDefault().cacheManager().getBeanCache(OCachedBean.class);
 
   @Test
   public void findById_when_idTypeConverted() {
diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
index d22c21e3b..c0d632abc 100644
--- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
+++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java
@@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBeanFetchJoinCache extends BaseTestCase {
 
-  private final ServerCache customerBeanCache = server().getServerCacheManager().getBeanCache(Customer.class);
+  private final ServerCache customerBeanCache = server().cacheManager().getBeanCache(Customer.class);
 
   @Test
   public void fetchCache_when_allHits() {
@@ -181,6 +181,6 @@ public class TestBeanFetchJoinCache extends BaseTestCase {
 
   private void initDataClearCache() {
     ResetBasicData.reset();
-    server().getServerCacheManager().clearAll();
+    server().cacheManager().clearAll();
   }
 }
diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
index bd655c2fd..6032728a4 100644
--- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
+++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java
@@ -27,7 +27,7 @@ public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase {
 
     // clearAll() caches via the ServerCacheManager ...
     // Clear all the caches on the default/primary EbeanServer
-    server().getServerCacheManager().clearAll();
+    server().cacheManager().clearAll();
 
     //TEST
     try (Transaction tx1 = Ebean.beginTransaction()) {
diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
index 6fbcdac6d..b8a2b518b 100644
--- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
+++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java
@@ -300,7 +300,7 @@ public class TestQueryCache extends BaseTestCase {
 
   @Test
   public void findCountDifferentQueriesBit() {
-    DB.getDefault().pluginApi().getServerCacheManager().clearAll();
+    DB.getDefault().pluginApi().cacheManager().clearAll();
     differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0));
     differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0));
     // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0
diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
index 20935a319..d057edffd 100644
--- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
+++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java
@@ -21,10 +21,10 @@ public class PersonCacheTests {
 
   private final List<Object> ids = Arrays.asList("E001", "E002", "E003");
 
-  private ServerCache beanCacheInfo = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheInfo.class);
-  private ServerCache beanCacheEmail = DB.getDefault().getServerCacheManager().getBeanCache(PersonCacheEmail.class);
+  private ServerCache beanCacheInfo = DB.getDefault().cacheManager().getBeanCache(PersonCacheInfo.class);
+  private ServerCache beanCacheEmail = DB.getDefault().cacheManager().getBeanCache(PersonCacheEmail.class);
 
-  private ServerCacheRegion region = DB.getDefault().getServerCacheManager().getRegion("email");
+  private ServerCacheRegion region = DB.getDefault().cacheManager().getRegion("email");
 
   private void insert(int id, String email) {
 
diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java
index 0f79a4206..af6c1299d 100644
--- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java
+++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java
@@ -56,7 +56,7 @@ public class TestInheritCacheRefLoad {
     Class streetClassLazyLoaded = customerReloaded.getAddress().getStreet().getClass();
 
     //Show Cache Hits
-    System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().getServerCacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount());
+    System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount());
     return streetClassLazyLoaded;
   }
 
diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
index 3b2cfc5f5..7411b1842 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java
@@ -27,7 +27,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
   private static boolean loadOnce;
 
   private ServerCacheManager cacheManager() {
-    return server().getServerCacheManager();
+    return server().cacheManager();
   }
 
   private static void insertSome() {
diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
index 236b2545e..a94b77725 100644
--- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
+++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
@@ -10,7 +10,6 @@ import io.ebean.cache.ServerCacheStatistics;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +24,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
   private static boolean loadOnce;
 
   private ServerCacheManager cacheManager() {
-    return server().getServerCacheManager();
+    return server().cacheManager();
   }
 
   private static void insertSome() {
diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
index f98590371..7eff8c97f 100644
--- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
+++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java
@@ -22,7 +22,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
 
     BeanType<EAddr> embType = Ebean.getDefaultServer().pluginApi().getBeanType(EAddr.class);
 
-    Ebean.getDefaultServer().getServerCacheManager().clearAll();
+    Ebean.getDefaultServer().cacheManager().clearAll();
 
     Country nz = Ebean.getReference(Country.class, "NZ");
 
diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
index b6ca2d3c0..616d0b441 100644
--- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
+++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java
@@ -77,7 +77,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase {
     assertEquals("3 Pineapple St", billAddress.getStreet());
 
     EbeanServer server = Ebean.getServer(null);
-    ServerCacheManager serverCacheManager = server.getServerCacheManager();
+    ServerCacheManager serverCacheManager = server.cacheManager();
 
     // get cache, clear the cache and statistics
     ServerCache beanCache = serverCacheManager.getBeanCache(EInvoice.class);
diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java
index 98f24353b..f2e74e4f5 100644
--- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java
+++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java
@@ -83,7 +83,7 @@ public class TestReadAudit extends BaseTestCase {
   public void test_findById_usingL2Cache() {
     resetCounters();
 
-    ServerCache beanCache = server.getServerCacheManager().getBeanCache(EBasicChangeLog.class);
+    ServerCache beanCache = server.cacheManager().getBeanCache(EBasicChangeLog.class);
     beanCache.getStatistics(true);
 
     EBasicChangeLog found = server.find(EBasicChangeLog.class, id1);
@@ -111,7 +111,7 @@ public class TestReadAudit extends BaseTestCase {
   public void test_findById_usingL2Cache_sharedBean() {
     resetCounters();
 
-    ServerCache beanCache = server.getServerCacheManager().getBeanCache(Country.class);
+    ServerCache beanCache = server.cacheManager().getBeanCache(Country.class);
     beanCache.getStatistics(true);
 
     Country found = server.find(Country.class, "AR");
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
index 568664de2..93ca61c87 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
@@ -74,7 +74,7 @@ public abstract class BaseTestCase {
   }
 
   protected void clearAllL2Cache() {
-    server().getServerCacheManager().clearAll();
+    server().cacheManager().clearAll();
   }
 
   protected void resetAllMetrics() {
@@ -238,7 +238,7 @@ public abstract class BaseTestCase {
   }
 
   protected <T> ServerCacheStatistics getBeanCacheStats(Class<T> cls, boolean reset) {
-    return server().getServerCacheManager().getBeanCache(cls).getStatistics(reset);
+    return server().cacheManager().getBeanCache(cls).getStatistics(reset);
   }
 
   protected Platform platform() {
diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java
index c61b521a0..b1f134ca3 100644
--- a/ebean-redis/src/test/java/org/integration/ClusterTest.java
+++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java
@@ -54,7 +54,7 @@ public class ClusterTest {
     fooA = DB.find(Person.class, foo.getId());
     assertCounts(dualCacheA, 2, 1, 0, 1);
     fooB = other.find(Person.class, foo.getId());
-    DuelCache dualCacheB = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
+    DuelCache dualCacheB = (DuelCache) other.cacheManager().getBeanCache(Person.class);
     assertCounts(dualCacheB, 2, 1, 1, 0);
   }
 
@@ -69,10 +69,10 @@ public class ClusterTest {
       foo.save();
     }
 
-    other.getServerCacheManager().clearAll();
+    other.cacheManager().clearAll();
     other.metaInfo().resetAllMetrics();
 
-    DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);
+    DuelCache dualCache = (DuelCache) other.cacheManager().getBeanCache(Person.class);
 
     Person foo0 = other.find(Person.class, 1);
     assertCounts(dualCache, 0, 1, 0, 1);