diff --git a/WORKSPACE b/WORKSPACE
index 7641e8019b..d7ce2f38b8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -212,6 +212,18 @@ maven_jar(
     sha1 = GUAVA_BIN_SHA1,
 )
 
+maven_jar(
+    name = "caffeine",
+    artifact = "com.github.ben-manes.caffeine:caffeine:2.6.1",
+    sha1 = "fc7a29feda0a3c5aaf1ff55e0df5417025e6d5f4",
+)
+
+maven_jar(
+    name = "caffeine_guava",
+    artifact = "com.github.ben-manes.caffeine:guava:2.6.1",
+    sha1 = "e1fbe0d8c06639d6fee74404f687f00da25671eb",
+)
+
 maven_jar(
     name = "velocity",
     artifact = "org.apache.velocity:velocity:1.7",
diff --git a/gerrit-cache-h2/BUILD b/gerrit-cache-h2/BUILD
index 45cf4167a4..55d47c2c41 100644
--- a/gerrit-cache-h2/BUILD
+++ b/gerrit-cache-h2/BUILD
@@ -8,6 +8,8 @@ java_library(
         "//gerrit-common:server",
         "//gerrit-extension-api:api",
         "//gerrit-server:server",
+        "//lib:caffeine",
+        "//lib:caffeine_guava",
         "//lib:guava",
         "//lib:h2",
         "//lib/guice",
@@ -22,6 +24,8 @@ junit_tests(
     deps = [
         ":cache-h2",
         "//gerrit-server:server",
+        "//lib:caffeine",
+        "//lib:caffeine_guava",
         "//lib:guava",
         "//lib:h2",
         "//lib:junit",
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java
index 356695592d..7b85834f50 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java
@@ -14,12 +14,16 @@
 
 package com.google.gerrit.server.cache.h2;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.github.benmanes.caffeine.cache.Weigher;
+import com.github.benmanes.caffeine.guava.CaffeinatedGuava;
 import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.google.common.cache.Weigher;
+import com.google.common.cache.RemovalNotification;
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.gerrit.server.cache.CacheBinding;
 import com.google.gerrit.server.cache.ForwardingRemovalListener;
@@ -57,35 +61,48 @@ public class DefaultCacheFactory implements MemoryCacheFactory {
 
   @Override
   public <K, V> Cache<K, V> build(CacheBinding<K, V> def) {
-    return create(def, false).build();
+    return CaffeinatedGuava.build(create(def, false));
   }
 
   @Override
   public <K, V> LoadingCache<K, V> build(CacheBinding<K, V> def, CacheLoader<K, V> loader) {
-    return create(def, false).build(loader);
+    return CaffeinatedGuava.build(create(def, false), loader);
   }
 
   @SuppressWarnings("unchecked")
-  <K, V> CacheBuilder<K, V> create(CacheBinding<K, V> def, boolean unwrapValueHolder) {
-    CacheBuilder<K, V> builder = newCacheBuilder();
+  <K, V> Caffeine<K, V> create(CacheBinding<K, V> def, boolean unwrapValueHolder) {
+    Caffeine<K, V> builder = newCacheBuilder();
     builder.recordStats();
     builder.maximumWeight(cfg.getLong("cache", def.name(), "memoryLimit", def.maximumWeight()));
 
-    builder = builder.removalListener(forwardingRemovalListenerFactory.create(def.name()));
+    builder =
+        builder.removalListener(
+            new CaffeineToGuavaRemovalListener<K, V>(
+                forwardingRemovalListenerFactory.create(def.name())));
 
-    Weigher<K, V> weigher = def.weigher();
-    if (weigher != null && unwrapValueHolder) {
-      final Weigher<K, V> impl = weigher;
-      weigher =
-          (Weigher<K, V>)
-              new Weigher<K, ValueHolder<V>>() {
-                @Override
-                public int weigh(K key, ValueHolder<V> value) {
-                  return impl.weigh(key, value.value);
-                }
-              };
-    } else if (weigher == null) {
-      weigher = unitWeight();
+    Weigher<K, V> weigher = null;
+    com.google.common.cache.Weigher<K, V> guavaWeigher = def.weigher();
+    if (guavaWeigher != null) {
+      if (unwrapValueHolder) {
+        weigher =
+            (Weigher<K, V>)
+                new Weigher<K, ValueHolder<V>>() {
+                  @Override
+                  public int weigh(K key, ValueHolder<V> value) {
+                    return guavaWeigher.weigh(key, value.value);
+                  }
+                };
+      } else {
+        weigher =
+            new Weigher<K, V>() {
+              @Override
+              public int weigh(K key, V value) {
+                return guavaWeigher.weigh(key, value);
+              }
+            };
+      }
+    } else {
+      weigher = Weigher.singletonWeigher();
     }
     builder.weigher(weigher);
 
@@ -107,16 +124,24 @@ public class DefaultCacheFactory implements MemoryCacheFactory {
   }
 
   @SuppressWarnings("unchecked")
-  private static <K, V> CacheBuilder<K, V> newCacheBuilder() {
-    return (CacheBuilder<K, V>) CacheBuilder.newBuilder();
+  private static <K, V> Caffeine<K, V> newCacheBuilder() {
+    return (Caffeine<K, V>) Caffeine.newBuilder();
   }
 
-  private static <K, V> Weigher<K, V> unitWeight() {
-    return new Weigher<K, V>() {
-      @Override
-      public int weigh(K key, V value) {
-        return 1;
-      }
-    };
+  private static class CaffeineToGuavaRemovalListener<K, V> implements RemovalListener<K, V> {
+
+    private com.google.common.cache.RemovalListener<K, V> guavalistener;
+
+    private CaffeineToGuavaRemovalListener(
+        com.google.common.cache.RemovalListener<K, V> guavalistener) {
+      this.guavalistener = guavalistener;
+    }
+
+    @Override
+    public void onRemoval(K key, V value, RemovalCause cause) {
+      guavalistener.onRemoval(
+          RemovalNotification.create(
+              key, value, com.google.common.cache.RemovalCause.valueOf(cause.name())));
+    }
   }
 }
diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
index 474fa366d8..1720eb012a 100644
--- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
+++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.cache.h2;
 
+import com.github.benmanes.caffeine.guava.CaffeinatedGuava;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -168,7 +169,7 @@ class H2CacheFactory implements PersistentCacheFactory, LifecycleListener {
             executor,
             store,
             def.keyType(),
-            (Cache<K, ValueHolder<V>>) defaultFactory.create(def, true).build());
+            (Cache<K, ValueHolder<V>>) CaffeinatedGuava.build(defaultFactory.create(def, true)));
     synchronized (caches) {
       caches.add(cache);
     }
@@ -188,9 +189,9 @@ class H2CacheFactory implements PersistentCacheFactory, LifecycleListener {
         newSqlStore(def.name(), def.keyType(), limit, def.expireAfterWrite(TimeUnit.SECONDS));
     Cache<K, ValueHolder<V>> mem =
         (Cache<K, ValueHolder<V>>)
-            defaultFactory
-                .create(def, true)
-                .build((CacheLoader<K, V>) new H2CacheImpl.Loader<>(executor, store, loader));
+            CaffeinatedGuava.build(
+                defaultFactory.create(def, true),
+                (CacheLoader<K, V>) new H2CacheImpl.Loader<>(executor, store, loader));
     H2CacheImpl<K, V> cache = new H2CacheImpl<>(executor, store, def.keyType(), mem);
     caches.add(cache);
     return cache;
diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD
index 067b4cd38c..5f50e2e57f 100644
--- a/gerrit-plugin-api/BUILD
+++ b/gerrit-plugin-api/BUILD
@@ -20,6 +20,8 @@ EXPORTS = [
     "//gerrit-gwtexpui:server",
     "//gerrit-reviewdb:server",
     "//gerrit-server/src/main/prolog:common",
+    "//lib:caffeine",
+    "//lib:caffeine_guava",
     "//lib/commons:dbcp",
     "//lib/commons:lang",
     "//lib/commons:lang3",
diff --git a/lib/BUILD b/lib/BUILD
index 91334cb83d..8e752c0a4a 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -82,6 +82,20 @@ java_library(
     exports = ["@guava//jar"],
 )
 
+java_library(
+    name = "caffeine",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@caffeine//jar"],
+)
+
+java_library(
+    name = "caffeine_guava",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@caffeine_guava//jar"],
+)
+
 java_library(
     name = "velocity",
     data = ["//lib:LICENSE-Apache2.0"],