diff --git a/src/main/java/io/ebean/meta/MetricType.java b/src/main/java/io/ebean/meta/MetricType.java
index 6b39cbc47..e0d718170 100644
--- a/src/main/java/io/ebean/meta/MetricType.java
+++ b/src/main/java/io/ebean/meta/MetricType.java
@@ -25,6 +25,11 @@ public enum MetricType {
    * <p>
    * SqlQuery and SqlUpdate without a label have no metrics collected.
    */
-  SQL
+  SQL,
+
+  /**
+   * L2 cache metrics.
+   */
+  L2
 
 }
diff --git a/src/main/java/io/ebeaninternal/metric/MetricFactory.java b/src/main/java/io/ebean/metric/MetricFactory.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/metric/MetricFactory.java
rename to src/main/java/io/ebean/metric/MetricFactory.java
index 72ccbb3ad..f068089d4 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricFactory.java
+++ b/src/main/java/io/ebean/metric/MetricFactory.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricType;
 
diff --git a/src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java b/src/main/java/io/ebean/metric/MetricServiceProvider.java
similarity index 94%
rename from src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java
rename to src/main/java/io/ebean/metric/MetricServiceProvider.java
index e90649780..d6a5e3721 100644
--- a/src/main/java/io/ebeaninternal/metric/MetricServiceProvider.java
+++ b/src/main/java/io/ebean/metric/MetricServiceProvider.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebeaninternal.server.profile.DMetricFactory;
 
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java b/src/main/java/io/ebean/metric/QueryPlanCollector.java
similarity index 92%
rename from src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
rename to src/main/java/io/ebean/metric/QueryPlanCollector.java
index aa7e901d5..17f49a3b8 100644
--- a/src/main/java/io/ebeaninternal/metric/QueryPlanCollector.java
+++ b/src/main/java/io/ebean/metric/QueryPlanCollector.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetaQueryMetric;
 
diff --git a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java b/src/main/java/io/ebean/metric/QueryPlanMetric.java
similarity index 89%
rename from src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
rename to src/main/java/io/ebean/metric/QueryPlanMetric.java
index f0d5e31db..edc2aaf03 100644
--- a/src/main/java/io/ebeaninternal/metric/QueryPlanMetric.java
+++ b/src/main/java/io/ebean/metric/QueryPlanMetric.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetric.java b/src/main/java/io/ebean/metric/TimedMetric.java
similarity index 95%
rename from src/main/java/io/ebeaninternal/metric/TimedMetric.java
rename to src/main/java/io/ebean/metric/TimedMetric.java
index 1bba42bb0..cd943375f 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetric.java
+++ b/src/main/java/io/ebean/metric/TimedMetric.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java b/src/main/java/io/ebean/metric/TimedMetricMap.java
similarity index 92%
rename from src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
rename to src/main/java/io/ebean/metric/TimedMetricMap.java
index 801bc74c1..70436f21a 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetricMap.java
+++ b/src/main/java/io/ebean/metric/TimedMetricMap.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetricVisitor;
 
diff --git a/src/main/java/io/ebeaninternal/metric/TimedMetricStats.java b/src/main/java/io/ebean/metric/TimedMetricStats.java
similarity index 89%
rename from src/main/java/io/ebeaninternal/metric/TimedMetricStats.java
rename to src/main/java/io/ebean/metric/TimedMetricStats.java
index 0353e56ab..03dbf2288 100644
--- a/src/main/java/io/ebeaninternal/metric/TimedMetricStats.java
+++ b/src/main/java/io/ebean/metric/TimedMetricStats.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.metric;
+package io.ebean.metric;
 
 import io.ebean.meta.MetaTimedMetric;
 
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
index c7ab221ef..de21fd1a9 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.QueryPlanMetric;
 import io.ebeaninternal.api.SpiDtoQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanMetric;
 
 /**
  * Request to map a resultSet columns for a query into a DTO bean.
diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
index b6218cbcd..969a131fb 100644
--- a/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
+++ b/src/main/java/io/ebeaninternal/server/dto/DtoQueryPlanBase.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.dto;
 
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
 
 abstract class DtoQueryPlanBase implements DtoQueryPlan {
 
diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
index 621f8338a..1a4bc7803 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java
@@ -2,9 +2,9 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.PersistRequestCallableSql;
 import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
index 40cd2b36a..404dc65c6 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricMap;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricMap;
 
 /**
  * Default metric factory implementation.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
index 950e10740..51e46ad86 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java
@@ -2,9 +2,9 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
 import io.ebean.service.SpiProfileLocationFactory;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
 
 /**
  * Default implementation of the profile location factory.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
index a3903ec1f..c049b99e7 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanCollector.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetaQueryMetric;
-import io.ebeaninternal.metric.QueryPlanCollector;
+import io.ebean.metric.QueryPlanCollector;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
index 1d7dff3e9..4f4240233 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.profile;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.QueryPlanMetric;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.QueryPlanMetric;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 class DQueryPlanMetric implements QueryPlanMetric {
 
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
index dc446b4a6..9dde68b79 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetricStats;
 
 /**
  * Snapshot of the current statistics for a Counter or TimeCounter.
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index bb7ee0b6f..e7eb4096d 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.TimedMetric;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAccumulator;
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
index 37f1b7632..f9e6a8472 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetricMap;
+import io.ebean.metric.TimedMetricMap;
 
 import java.util.concurrent.ConcurrentHashMap;
 
diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
index 5479bc686..f9403b8bb 100644
--- a/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/DTimedProfileLocation.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 /**
  * Default profile location that uses stack trace.
diff --git a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
index 6402993ce..bc98f2fd2 100644
--- a/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
+++ b/src/main/java/io/ebeaninternal/server/profile/TimedProfileLocation.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile;
 
 import io.ebean.ProfileLocation;
 import io.ebean.meta.MetricVisitor;
-import io.ebeaninternal.metric.TimedMetric;
+import io.ebean.metric.TimedMetric;
 
 /**
  * ProfileLocation that collects timing metrics.
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 657a2bdcc..e2ad826d7 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -4,11 +4,11 @@ import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.meta.MetricType;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
 import io.ebeaninternal.api.CQueryPlanKey;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 83defb38a..56653ef95 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -5,8 +5,8 @@ import io.ebean.bean.ObjectGraphNode;
 import io.ebean.meta.MetaOrmQueryMetric;
 import io.ebean.meta.MetaOrmQueryOrigin;
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricStats;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricStats;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index d46aaf0a3..d580a878c 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -5,9 +5,9 @@ import io.ebean.RowMapper;
 import io.ebean.SqlRow;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.core.Message;
 import io.ebeaninternal.server.core.RelationalQueryEngine;
 import io.ebeaninternal.server.core.RelationalQueryRequest;
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index ee1ded434..3a79d43b9 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -15,6 +15,9 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.MetricFactory;
+import io.ebean.metric.TimedMetric;
+import io.ebean.metric.TimedMetricMap;
 import io.ebeaninternal.api.ScopeTrans;
 import io.ebeaninternal.api.ScopedTransaction;
 import io.ebeaninternal.api.SpiLogManager;
@@ -25,9 +28,6 @@ import io.ebeaninternal.api.SpiTransactionManager;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.api.TransactionEventTable.TableIUD;
-import io.ebeaninternal.metric.MetricFactory;
-import io.ebeaninternal.metric.TimedMetric;
-import io.ebeaninternal.metric.TimedMetricMap;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.ClockService;
diff --git a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
index 457bfad89..7ec7e7667 100644
--- a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
+++ b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.profile;
 
 import io.ebean.meta.MetricType;
-import io.ebeaninternal.metric.MetricFactory;
+import io.ebean.metric.MetricFactory;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;