You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2026/03/19 21:27:16 UTC

(jackrabbit-oak) 01/01: OAK-11946 : migrate cache APIs to Caffeine

This is an automated email from the ASF dual-hosted git repository.

daim pushed a commit to branch OAK-11946
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit c81a18353779a806fbdeebe7fcf57d869a938973
Author: rishabhdaim <ri...@gmail.com>
AuthorDate: Fri Mar 20 02:56:58 2026 +0530

    OAK-11946 : migrate cache APIs to Caffeine
---
 oak-benchmarks/pom.xml                             |   4 +
 .../oak/benchmark/PersistentCacheTest.java         |   2 +-
 oak-blob-cloud-azure/pom.xml                       |   4 +
 .../azure/blobstorage/AzureBlobStoreBackend.java   |   6 +-
 .../blobstorage/v8/AzureBlobStoreBackendV8.java    |   6 +-
 .../blobstorage/AzureBlobStoreBackendTest.java     |   2 +-
 oak-blob-cloud/pom.xml                             |   4 +
 .../jackrabbit/oak/blob/cloud/s3/S3Backend.java    |   6 +-
 oak-blob-plugins/pom.xml                           |   4 +
 .../blob/AbstractSharedCachingDataStore.java       |   2 +-
 .../oak/plugins/blob/CachingBlobStore.java         |   2 +-
 .../oak/plugins/blob/CompositeDataStoreCache.java  |   7 +-
 .../jackrabbit/oak/plugins/blob/FileCache.java     |  21 ++-
 .../oak/plugins/blob/UploadStagingCache.java       |   2 +-
 .../plugins/blob/datastore/DataStoreBlobStore.java |  22 ++-
 .../plugins/blob/AbstractDataStoreCacheTest.java   |   4 +-
 oak-blob/pom.xml                                   |   4 +
 .../jackrabbit/oak/spi/blob/split/BlobIdSet.java   |   6 +-
 oak-core-spi/pom.xml                               |   6 +
 .../jackrabbit/oak/cache/AbstractCacheStats.java   |  11 +-
 .../org/apache/jackrabbit/oak/cache/CacheLIRS.java | 156 ++++++++++++++++-----
 .../apache/jackrabbit/oak/cache/CacheStats.java    |   8 +-
 .../jackrabbit/oak/cache/EmpiricalWeigher.java     |   2 +-
 .../apache/jackrabbit/oak/cache/package-info.java  |   2 +-
 .../apache/jackrabbit/oak/cache/CacheSizeTest.java |   6 +-
 .../jackrabbit/oak/cache/CacheStatsTest.java       |  47 +++----
 .../org/apache/jackrabbit/oak/cache/CacheTest.java |  38 ++---
 .../oak/cache/ConcurrentPerformanceTest.java       |  24 +---
 .../oak/cache/impl/CacheStatsMetricsTest.java      |   6 +-
 oak-parent/pom.xml                                 |   5 +
 oak-run-commons/pom.xml                            |   4 +
 .../plugins/document/DocumentNodeStoreHelper.java  |   2 +-
 oak-search-elastic/pom.xml                         |   4 +
 .../index/elastic/ElasticIndexStatistics.java      |  55 ++++----
 .../index/elastic/ElasticIndexStatisticsTest.java  |   2 +-
 oak-search/pom.xml                                 |   4 +
 .../plugins/index/search/ExtractedTextCache.java   |   8 +-
 oak-segment-tar/pom.xml                            |   4 +
 .../jackrabbit/oak/segment/CacheWeights.java       |   2 +-
 .../apache/jackrabbit/oak/segment/ReaderCache.java |   2 +-
 .../apache/jackrabbit/oak/segment/RecordCache.java |  28 ++--
 .../jackrabbit/oak/segment/RecordCacheStats.java   |   2 +-
 .../jackrabbit/oak/segment/SegmentCache.java       |  77 ++++++----
 .../jackrabbit/oak/segment/WriterCacheManager.java |   4 +-
 .../jackrabbit/oak/segment/file/PriorityCache.java |   8 +-
 .../persistentcache/SegmentCacheStats.java         |   7 +-
 .../persistence/persistentcache/package-info.java  |   2 +-
 .../segment/file/ConcurrentPriorityCacheTest.java  |   2 +-
 .../oak/segment/file/PriorityCacheTest.java        |   4 +-
 .../document/CachingCommitValueResolver.java       |   8 +-
 .../oak/plugins/document/DocumentNodeStore.java    |  36 ++---
 .../plugins/document/DocumentNodeStoreBuilder.java |  31 ++--
 .../oak/plugins/document/LocalDiffCache.java       |   2 +-
 .../oak/plugins/document/MemoryDiffCache.java      |  26 ++--
 .../oak/plugins/document/NodeDocument.java         |   2 +-
 .../oak/plugins/document/TieredDiffCache.java      |   6 +-
 .../plugins/document/cache/ForwardingListener.java |   8 +-
 .../plugins/document/cache/NodeDocumentCache.java  |  35 +++--
 .../document/persistentCache/EvictionListener.java |   2 +-
 .../document/persistentCache/NodeCache.java        |  70 ++++-----
 .../document/persistentCache/PersistentCache.java  |   2 +-
 .../oak/plugins/document/AsyncCacheTest.java       |   2 +-
 .../oak/plugins/document/BranchTest.java           |   2 +-
 .../oak/plugins/document/DisableCacheTest.java     |   4 +-
 .../oak/plugins/document/Sweep2Test.java           |   2 +-
 .../document/VersionGarbageCollectorIT.java        |   2 +-
 .../document/cache/CacheChangesTrackerTest.java    |   2 +-
 .../document/persistentCache/AsyncQueueTest.java   |   2 +-
 .../document/persistentCache/BroadcastTest.java    |   2 +-
 .../document/persistentCache/CacheTest.java        |   2 +-
 .../document/persistentCache/NodeCacheTest.java    |   2 +-
 71 files changed, 481 insertions(+), 409 deletions(-)

diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml
index 82284e37c7..97d072c83e 100644
--- a/oak-benchmarks/pom.xml
+++ b/oak-benchmarks/pom.xml
@@ -82,6 +82,10 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-api</artifactId>
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
index 024e874d1c..4086b536de 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.jcr.Repository;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.fixture.OakFixture;
 import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml
index 306096f152..ce93d587ae 100644
--- a/oak-blob-cloud-azure/pom.xml
+++ b/oak-blob-cloud-azure/pom.xml
@@ -172,6 +172,10 @@
             <artifactId>oak-shaded-guava</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
 
         <!-- Dependencies to other Oak components -->
         <dependency>
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
index 0f18882dcc..b53db7b30e 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
@@ -38,8 +38,8 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
 import org.apache.jackrabbit.oak.commons.conditions.Validate;
 import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord;
@@ -767,7 +767,7 @@ public class AzureBlobStoreBackend extends AbstractAzureBlobStoreBackend {
         // max size 0 or smaller is used to turn off the cache
         if (maxSize > 0) {
             LOG.info("presigned GET URI cache enabled, maxSize = {} items, expiry = {} seconds", maxSize, httpDownloadURIExpirySeconds / 2);
-            httpDownloadURICache = CacheBuilder.newBuilder()
+            httpDownloadURICache = Caffeine.newBuilder()
                     .maximumSize(maxSize)
                     .expireAfterWrite(httpDownloadURIExpirySeconds / 2, TimeUnit.SECONDS)
                     .build();
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
index 11904fb3a5..246af35fdf 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
@@ -62,8 +62,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.jackrabbit.oak.commons.collections.AbstractIterator;
 import org.apache.jackrabbit.oak.commons.time.Stopwatch;
 
@@ -731,7 +731,7 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
         // max size 0 or smaller is used to turn off the cache
         if (maxSize > 0) {
             LOG.info("presigned GET URI cache enabled, maxSize = {} items, expiry = {} seconds", maxSize, httpDownloadURIExpirySeconds / 2);
-            httpDownloadURICache = CacheBuilder.newBuilder()
+            httpDownloadURICache = Caffeine.newBuilder()
                     .maximumSize(maxSize)
                     .expireAfterWrite(httpDownloadURIExpirySeconds / 2, TimeUnit.SECONDS)
                     .build();
diff --git a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
index 0b54c7870b..8c11af6e82 100644
--- a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
+++ b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackendTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.lang3.reflect.MethodUtils;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordDownloadOptions;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordUpload;
diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml
index 5aebdaf947..304f55d139 100644
--- a/oak-blob-cloud/pom.xml
+++ b/oak-blob-cloud/pom.xml
@@ -430,6 +430,10 @@
             <artifactId>oak-shaded-guava</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
index d79297f11b..d3ea1bd846 100644
--- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
+++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
@@ -63,8 +63,8 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
@@ -812,7 +812,7 @@ public class S3Backend extends AbstractSharedBackend {
         // max size 0 or smaller is used to turn off the cache
         if (maxSize > 0) {
             LOG.info("presigned GET URI cache enabled, maxSize = {} items, expiry = {} seconds", maxSize, httpDownloadURIExpirySeconds / 2);
-            httpDownloadURICache = CacheBuilder.newBuilder()
+            httpDownloadURICache = Caffeine.newBuilder()
                     .maximumSize(maxSize)
                     // cache for half the expiry time of the URIs before giving out new ones
                     .expireAfterWrite(httpDownloadURIExpirySeconds / 2, TimeUnit.SECONDS)
diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml
index 128ee79a1b..bb2c25fc1e 100644
--- a/oak-blob-plugins/pom.xml
+++ b/oak-blob-plugins/pom.xml
@@ -131,6 +131,10 @@
       <artifactId>oak-shaded-guava</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java
index 569f45cd71..2d8f49bc0b 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.core.data.MultiDataStoreAware;
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.CacheLoader;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.TypedDataStore;
 import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord;
 import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
index 1fbb03c0fc..87d3296251 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.plugins.blob;
 
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.commons.StringUtils;
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java
index d1605d326c..a6f67a913b 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java
@@ -27,8 +27,7 @@ import java.io.InputStream;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.jackrabbit.guava.common.cache.AbstractCache;
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.CacheLoader;
 import org.apache.jackrabbit.oak.commons.IOUtils;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.jetbrains.annotations.Nullable;
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  */
-public class CompositeDataStoreCache extends AbstractCache<String, File> implements Closeable {
+public class CompositeDataStoreCache implements Closeable {
     /**
      * Logger instance.
      */
@@ -96,7 +95,6 @@ public class CompositeDataStoreCache extends AbstractCache<String, File> impleme
     }
 
     @Nullable
-    @Override
     public File getIfPresent(Object key) {
         return getIfPresent((String) key);
     }
@@ -116,7 +114,6 @@ public class CompositeDataStoreCache extends AbstractCache<String, File> impleme
         }
     }
 
-    @Override
     public void invalidate(Object key) {
         stagingCache.invalidate((String) key);
         downloadCache.invalidate(key);
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
index 049b2823b3..b2836461a1 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
@@ -35,10 +35,10 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.commons.StringUtils;
@@ -49,11 +49,9 @@ import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.jackrabbit.guava.common.cache.AbstractCache;
-
 /**
  */
-public class FileCache extends AbstractCache<String, File> implements Closeable {
+public class FileCache implements Closeable {
     /**
      * Logger instance.
      */
@@ -201,7 +199,7 @@ public class FileCache extends AbstractCache<String, File> implements Closeable
      * Get the current entry count (number of files).
      */
     public long getEntryCount() {
-        return cache.size();
+        return cache.estimatedSize();
     }
 
     private FileCache() {
@@ -257,7 +255,6 @@ public class FileCache extends AbstractCache<String, File> implements Closeable
      * @param key of the file
      * @param file to put into cache
      */
-    @Override
     public void put(String key, File file) {
         adjustSize();
         put(key, file, true);
@@ -302,7 +299,6 @@ public class FileCache extends AbstractCache<String, File> implements Closeable
     }
 
     @Nullable
-    @Override
     public File getIfPresent(Object key) {
         return getIfPresent((String) key);
     }
@@ -320,7 +316,7 @@ public class FileCache extends AbstractCache<String, File> implements Closeable
     }
 
     private void adjustSize() {
-        long currentSize = cache.size();
+        long currentSize = cache.estimatedSize();
         if (currentSize > highWaterMark) {
             highWaterMark = currentSize;
             // low for each additional 50'000 entries
@@ -362,11 +358,10 @@ public class FileCache extends AbstractCache<String, File> implements Closeable
         // never grow larger than the configured size
         currentBlockLimit = Math.min(currentBlockLimit, maxBlocks);
         LOG.info("Shrinking the file cache size to {} because there are {} files (limit: {})",
-                currentBlockLimit, cache.size(), maxEntryCount);
+                currentBlockLimit, cache.estimatedSize(), maxEntryCount);
         cache.setMaxMemory(currentBlockLimit);
     }
 
-    @Override
     public void invalidate(Object key) {
         cache.invalidate(key);
     }
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
index 4210c59071..d96ea8a22b 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.oak.commons.StringUtils;
 import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
index e63bedce40..3ea5461fa9 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
@@ -34,8 +34,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.TimeUnit;
 
 import javax.jcr.RepositoryException;
@@ -47,8 +46,8 @@ import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStore;
 import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.core.data.MultiDataStoreAware;
-import org.apache.jackrabbit.guava.common.cache.LoadingCache;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.blob.BlobAccessProvider;
 import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions;
@@ -420,19 +419,16 @@ public class DataStoreBlobStore
                 && blobId.hasLengthInfo()
                 && blobId.length <= maxCachedBinarySize) {
             try {
-                byte[] content = cache.get(blobId.blobId, new Callable<byte[]>() {
-                    @Override
-                    public byte[] call() throws Exception {
-                        boolean threw = true;
-                        try (InputStream stream = getStream(blobId.blobId)) {
-                            byte[] result = IOUtils.toByteArray(stream);
-                            return result;
-                        }
+                byte[] content = cache.get(blobId.blobId, key -> {
+                    try (InputStream stream = getStream(key)) {
+                        return IOUtils.toByteArray(stream);
+                    } catch (IOException e) {
+                        throw new CompletionException(e);
                     }
                 });
 
                 return new ByteArrayInputStream(content);
-            } catch (ExecutionException e) {
+            } catch (CompletionException e) {
                 log.warn("Error occurred while loading bytes from steam while fetching for id {}", encodedBlobId, e);
             }
         }
diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java
index 6b4c720b87..35cc90ec40 100644
--- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java
+++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java
@@ -55,7 +55,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.CacheLoader;
 import org.apache.jackrabbit.oak.commons.FileIOUtils;
 import org.apache.jackrabbit.oak.spi.blob.AbstractDataRecord;
 import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
@@ -112,7 +112,7 @@ public class AbstractDataStoreCacheTest {
     }
 
 
-    static class TestCacheLoader extends CacheLoader<String, InputStream> {
+    static class TestCacheLoader implements CacheLoader<String, InputStream> {
         protected File root;
 
         public TestCacheLoader(File dir) {
diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml
index 70a8a5aa0f..1ac8c80458 100644
--- a/oak-blob/pom.xml
+++ b/oak-blob/pom.xml
@@ -99,6 +99,10 @@
       <artifactId>oak-shaded-guava</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/BlobIdSet.java b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/BlobIdSet.java
index ffed802581..3911ee0b12 100644
--- a/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/BlobIdSet.java
+++ b/oak-blob/src/main/java/org/apache/jackrabbit/oak/spi/blob/split/BlobIdSet.java
@@ -29,8 +29,8 @@ import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.apache.jackrabbit.oak.commons.collections.BloomFilter;
 
 class BlobIdSet {
@@ -46,7 +46,7 @@ class BlobIdSet {
     BlobIdSet(String repositoryDir, String filename) {
         store = new File(new File(repositoryDir), filename);
         bloomFilter = BloomFilter.construct(9000000, 0.03); // 9M entries, 3% false positive rate
-        cache = CacheBuilder.newBuilder().maximumSize(1000).build();
+        cache = Caffeine.newBuilder().maximumSize(1000).build();
         fillBloomFilter();
     }
 
diff --git a/oak-core-spi/pom.xml b/oak-core-spi/pom.xml
index 0f85288bd9..9a7712abfc 100644
--- a/oak-core-spi/pom.xml
+++ b/oak-core-spi/pom.xml
@@ -124,6 +124,12 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Caffeine cache -->
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
+
     <!-- Logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
index ba2b8c381c..646e5723cd 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
@@ -25,7 +25,7 @@ import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
 import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
 import org.jetbrains.annotations.NotNull;
@@ -38,8 +38,7 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen
     @NotNull
     private final String name;
 
-    private CacheStats lastSnapshot =
-            new CacheStats(0, 0, 0, 0, 0, 0);
+    private CacheStats lastSnapshot = CacheStats.empty();
 
     /**
      * Create a new {@code CacheStatsMBean} for a cache with the given {@code name}.
@@ -62,7 +61,7 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen
 
     @Override
     public synchronized void resetStats() {
-        // Cache stats cannot be rest at Guava level. Instead we
+        // Cache stats cannot be reset directly. Instead we
         // take a snapshot and then subtract it from future stats calls
         lastSnapshot = getCurrentStats();
     }
@@ -110,12 +109,12 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen
 
     @Override
     public long getLoadExceptionCount() {
-        return stats().loadExceptionCount();
+        return stats().loadFailureCount();
     }
 
     @Override
     public double getLoadExceptionRate() {
-        return stats().loadExceptionRate();
+        return stats().loadFailureRate();
     }
 
     @Override
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheLIRS.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheLIRS.java
index e41a1daacf..c6ff70409c 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheLIRS.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheLIRS.java
@@ -31,13 +31,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.LongAdder;
 
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.guava.common.cache.LoadingCache;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Policy;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.Weigher;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.function.Function;
 import org.apache.jackrabbit.oak.commons.annotations.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -284,6 +289,19 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
     }
 
     @Override
+    public V get(K key, Function<? super K, ? extends V> mappingFunction) {
+        int hash = getHash(key);
+        try {
+            return getSegment(hash).get(key, hash, () -> mappingFunction.apply(key));
+        } catch (ExecutionException e) {
+            throw new CompletionException(e.getCause());
+        }
+    }
+
+    /**
+     * @deprecated use {@link #get(Object, Function)} instead
+     */
+    @Deprecated
     public V get(K key, Callable<? extends V> valueLoader)
             throws ExecutionException {
         int hash = getHash(key);
@@ -293,33 +311,31 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
     /**
      * Get the value, loading it if needed.
      * <p>
-     * If there is an exception loading, an RuntimeException is
-     * thrown.
+     * If there is an exception loading, a RuntimeException is thrown.
      *
      * @param key the key
      * @return the value
-     * @throws RuntimeException
      */
-    @Override
     public V getUnchecked(K key) {
-        try {
-            return get(key);
-        } catch (ExecutionException e) {
-            throw new RuntimeException(e);
-        }
+        return get(key);
     }
 
     /**
      * Get the value, loading it if needed.
+     * <p>
+     * Throws {@link CompletionException} (unchecked) if loading fails.
      *
      * @param key the key
      * @return the value
-     * @throws ExecutionException
      */
     @Override
-    public V get(K key) throws ExecutionException {
+    public V get(K key) {
         int hash = getHash(key);
-        return getSegment(hash).get(key, hash, loader);
+        try {
+            return getSegment(hash).get(key, hash, loader);
+        } catch (ExecutionException e) {
+            throw new CompletionException(e.getCause());
+        }
     }
 
     /**
@@ -327,18 +343,39 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
      * <p>
      * If there is an exception while loading, it is logged and ignored. This
      * method calls CacheLoader.reload, but synchronously replaces the old
-     * value.
+     * value. Returns a completed future with the refreshed value.
      *
      * @param key the key
+     * @return a completed future with the value after refresh
      */
     @Override
-    public void refresh(K key) {
+    public CompletableFuture<V> refresh(K key) {
         int hash = getHash(key);
         try {
             getSegment(hash).refresh(key, hash, loader);
         } catch (ExecutionException e) {
             LOG.warn("Could not refresh value for key " + key, e);
         }
+        return CompletableFuture.completedFuture(getIfPresent(key));
+    }
+
+    /**
+     * Re-load the values for the given keys.
+     *
+     * @param keys the keys to refresh
+     * @return a completed future with a map of key-value pairs after refresh
+     */
+    @Override
+    public CompletableFuture<Map<K, V>> refreshAll(Iterable<? extends K> keys) {
+        Map<K, V> result = new HashMap<>();
+        for (K key : keys) {
+            refresh(key);
+            V v = getIfPresent(key);
+            if (v != null) {
+                result.put(key, v);
+            }
+        }
+        return CompletableFuture.completedFuture(result);
     }
 
     V replace(K key, V value) {
@@ -415,10 +452,9 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
         return getSegment(hash).remove(key, hash);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public void invalidateAll(Iterable<?> keys) {
-        for (K k : (Iterable<K>) keys) {
+    public void invalidateAll(Iterable<? extends K> keys) {
+        for (K k : keys) {
             invalidate(k);
         }
     }
@@ -621,7 +657,6 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
      *
      * @return the number of entries
      */
-    @Override
     public long size() {
         int x = 0;
         for (Segment<K, V> s : segments) {
@@ -658,7 +693,12 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
     }
 
     @Override
-    public CacheStats stats() {
+    public long estimatedSize() {
+        return size();
+    }
+
+    @Override
+    public com.github.benmanes.caffeine.cache.stats.CacheStats stats() {
         long hitCount = 0;
         long missCount = 0;
         long loadSuccessCount = 0;
@@ -673,9 +713,52 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
             totalLoadTime += s.totalLoadTime.longValue();
             evictionCount += s.evictionCount.longValue();
         }
-        CacheStats stats = new CacheStats(hitCount, missCount, loadSuccessCount,
-                loadExceptionCount, totalLoadTime, evictionCount);
-        return stats;
+        return com.github.benmanes.caffeine.cache.stats.CacheStats.of(hitCount, missCount,
+                loadSuccessCount, loadExceptionCount, totalLoadTime, evictionCount, 0);
+    }
+
+    @Override
+    public Policy<K, V> policy() {
+        CacheLIRS<K, V> self = this;
+        return new Policy<K, V>() {
+            @Override
+            public boolean isRecordingStats() {
+                return true;
+            }
+            @Override
+            public V getIfPresentQuietly(K key) {
+                return self.peek(key);
+            }
+            @Override
+            public Optional<Policy.Eviction<K, V>> eviction() {
+                return Optional.of(new Policy.Eviction<K, V>() {
+                    @Override public boolean isWeighted() { return true; }
+                    @Override public OptionalLong weightedSize() {
+                        return OptionalLong.of(self.getUsedMemory());
+                    }
+                    @Override public OptionalInt weightOf(K key) {
+                        int mem = self.getMemory(key);
+                        return mem > 0 ? OptionalInt.of(mem) : OptionalInt.empty();
+                    }
+                    @Override public long getMaximum() { return self.getMaxMemory(); }
+                    @Override public void setMaximum(long maximum) { self.setMaxMemory(maximum); }
+                    @Override public Map<K, V> coldest(int limit) { return Collections.emptyMap(); }
+                    @Override public Map<K, V> coldestWeighted(long weightLimit) { return Collections.emptyMap(); }
+                    @Override public Map<K, V> hottest(int limit) { return Collections.emptyMap(); }
+                    @Override public Map<K, V> hottestWeighted(long weightLimit) { return Collections.emptyMap(); }
+                });
+            }
+            @Override
+            public Optional<Policy.FixedExpiration<K, V>> expireAfterAccess() { return Optional.empty(); }
+            @Override
+            public Optional<Policy.FixedExpiration<K, V>> expireAfterWrite() { return Optional.empty(); }
+            @Override
+            public Optional<Policy.FixedRefresh<K, V>> refreshAfterWrite() { return Optional.empty(); }
+            @Override
+            public Map<K, CompletableFuture<V>> refreshes() { return Collections.emptyMap(); }
+            @Override
+            public Optional<Policy.VarExpiration<K, V>> expireVariably() { return Optional.empty(); }
+        };
     }
 
     /**
@@ -1111,8 +1194,7 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
                 if (old == null) {
                     value = loader.load(key);
                 } else {
-                    ListenableFuture<V> future = loader.reload(key, old);
-                    value = future.get();
+                    value = loader.reload(key, old);
                 }
                 loadSuccessCount.increment();
             } catch (Exception e) {
@@ -1649,7 +1731,7 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
     }
 
     @Override
-    public ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
+    public Map<K, V> getAllPresent(Iterable<? extends K> keys) {
         throw new UnsupportedOperationException();
     }
 
@@ -1760,14 +1842,18 @@ public class CacheLIRS<K, V> implements LoadingCache<K, V> {
     }
 
     @Override
-    public ImmutableMap<K, V> getAll(Iterable<? extends K> keys)
-            throws ExecutionException {
+    public Map<K, V> getAll(Iterable<? extends K> keys) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    public Map<K, V> getAll(Iterable<? extends K> keys,
+            Function<? super Set<? extends K>, ? extends Map<? extends K, ? extends V>> mappingFunction) {
+        throw new UnsupportedOperationException();
+    }
+
     public V apply(K key) {
-        throw new UnsupportedOperationException();        
+        throw new UnsupportedOperationException();
     }
 
     public boolean isEmpty() {
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
index 3860b91dfd..f774e387fa 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
@@ -21,8 +21,8 @@ package org.apache.jackrabbit.oak.cache;
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Weigher;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -56,13 +56,13 @@ public class CacheStats extends AbstractCacheStats {
     }
 
     @Override
-    protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() {
+    protected com.github.benmanes.caffeine.cache.stats.CacheStats getCurrentStats() {
         return cache.stats();
     }
 
     @Override
     public long getElementCount() {
-        return cache.size();
+        return cache.estimatedSize();
     }
 
     @Override
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
index 871a48fbd1..ef47dbbac7 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.cache;
 
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
index 8f8f45aed3..a9a2f2e433 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
@@ -19,7 +19,7 @@
  * <em>For Oak internal use only. Do not use outside Oak components.</em>
  */
 @Internal(since = "1.1.1")
-@Version("2.0")
+@Version("3.0")
 package org.apache.jackrabbit.oak.cache;
 
 import org.apache.jackrabbit.oak.commons.annotations.Internal;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheSizeTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheSizeTest.java
index bcd05a9a82..95ed27d9b3 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheSizeTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheSizeTest.java
@@ -23,9 +23,9 @@ import java.util.concurrent.ExecutionException;
 import org.apache.jackrabbit.oak.cache.CacheLIRS.EvictionCallback;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.Weigher;
 
 /**
  * Test the maximum cache size (for the FileCache).
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java
index 2f0e3e4894..1c02f7fad6 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java
@@ -21,13 +21,9 @@ package org.apache.jackrabbit.oak.cache;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
-import org.jetbrains.annotations.NotNull;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -35,14 +31,9 @@ public class CacheStatsTest {
     private static final String NAME = "cache stats";
     private static final int KEYS = 100;
 
-    private final Weigher<Integer, Integer> weigher = new Weigher<Integer, Integer>() {
-        @Override
-        public int weigh(@NotNull Integer key, @NotNull Integer value) {
-            return 1;
-        }
-    };
+    private final Weigher<Integer, Integer> weigher = (key, value) -> 1;
 
-    private final Cache<Integer, Integer> cache = CacheBuilder.newBuilder()
+    private final Cache<Integer, Integer> cache = Caffeine.newBuilder()
                 .recordStats()
                 .maximumWeight(Long.MAX_VALUE)
                 .weigher(weigher)
@@ -64,25 +55,21 @@ public class CacheStatsTest {
         for (int k = 0; k < 100; k++) {
             final int key = 4 * k;
             try {
-                cache.get(key, new Callable<Integer>() {
-                    @Override
-                    public Integer call() throws Exception {
-                        long t0 = System.nanoTime();
-                        try {
-                            if (key % 10 == 0) {
-                                fails++;
-                                throw new Exception("simulated load failure");
-                            } else {
-                                misses++;
-                                return key;
-                            }
-                        } finally {
-                            loadTime += System.nanoTime() - t0;
+                cache.get(key, ignored -> {
+                    long t0 = System.nanoTime();
+                    try {
+                        if (key % 10 == 0) {
+                            fails++;
+                            throw new RuntimeException("simulated load failure");
+                        } else {
+                            misses++;
+                            return key;
                         }
-
+                    } finally {
+                        loadTime += System.nanoTime() - t0;
                     }
                 });
-            } catch (ExecutionException ignore) { }
+            } catch (Exception ignore) { }
         }
     }
 
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheTest.java
index a1b61536d4..06bdc48bc9 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheTest.java
@@ -33,20 +33,14 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
 
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.cache.CacheLIRS.EvictionCallback;
-import org.apache.jackrabbit.oak.commons.internal.concurrent.FutureConverter;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
-import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture;
-
 /**
  * Tests the LIRS cache.
  */
@@ -356,7 +350,7 @@ public class CacheTest {
     }
     
     @Test
-    public void testNonResidentBecomeHot() throws ExecutionException {
+    public void testNonResidentBecomeHot() {
         CacheLIRS<Integer, Integer> test = createCache(4);
         for (int i = 0; i < 20; i++) {
             test.put(i, 1);
@@ -602,14 +596,7 @@ public class CacheTest {
     public void testBadLoader() {
         CacheLIRS<Integer, String> cache = createCache(10, 1);
         try {
-            cache.get(1, new Callable<String>() {
-
-                @Override
-                public String call() throws Exception {
-                    return null;
-                }
-                
-            });
+            cache.get(1, k -> null);
             fail();
         } catch (Exception e) {
             // expected
@@ -660,7 +647,7 @@ public class CacheTest {
     }
     
     @Test
-    public void testRefresh() throws ExecutionException {
+    public void testRefresh() {
         CacheLIRS<Integer, String> cache = new CacheLIRS.Builder<Integer, String>().
                 maximumWeight(100).
                 weigher(new Weigher<Integer, String>() {
@@ -669,7 +656,7 @@ public class CacheTest {
                     public int weigh(Integer key, String value) {
                         return key + value.length();
                     }
-                    
+
                 }).
                 build(new CacheLoader<Integer, String>() {
 
@@ -681,13 +668,6 @@ public class CacheTest {
                         return "n" + key;
                     }
 
-                    @Override
-                    public ListenableFuture<String> reload(Integer key, String oldValue) {
-                        assertTrue(oldValue != null);
-                        CompletableFuture<String> f = CompletableFuture.completedFuture(oldValue);
-                        return FutureConverter.toListenableFuture(f);
-                    }
-
                 });
         assertEquals("n1", cache.get(1));
         cache.refresh(1);
@@ -703,7 +683,7 @@ public class CacheTest {
     }
 
     @Test
-    public void evictionCallback() throws ExecutionException {
+    public void evictionCallback() {
         final Set<String> evictedKeys = new HashSet<>();
         final Set<Integer> evictedValues = new HashSet<>();
         CacheLIRS<String, Integer> cache = CacheLIRS.<String, Integer>newBuilder()
@@ -799,7 +779,7 @@ public class CacheTest {
     }
 
     @Test
-    public void evictionCallbackRandomized() throws ExecutionException {
+    public void evictionCallbackRandomized() {
         final HashMap<Integer, Integer> evictedMap = new HashMap<Integer, Integer>();
         final HashSet<Integer> evictedNonResidentSet = new HashSet<Integer>();
         CacheLIRS<Integer, Integer> cache = CacheLIRS.<Integer, Integer>newBuilder()
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentPerformanceTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentPerformanceTest.java
index e1b905fd92..11f282307c 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentPerformanceTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentPerformanceTest.java
@@ -21,17 +21,14 @@ package org.apache.jackrabbit.oak.cache;
 import static org.junit.Assert.assertFalse;
 
 import java.util.Random;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-
 /**
  * Compares the LIRS cache by concurrently reading.
  */
@@ -43,8 +40,7 @@ public class ConcurrentPerformanceTest {
             return new CacheLIRS.Builder<Integer, Integer>()
                     .segmentCount(concurrencyLevel).maximumSize(1000).build();
         }
-        return CacheBuilder.newBuilder().concurrencyLevel(concurrencyLevel)
-                .maximumSize(1000).build();
+        return Caffeine.newBuilder().maximumSize(1000).build();
     }
 
     @Test
@@ -81,19 +77,7 @@ public class ConcurrentPerformanceTest {
                     Random r = new Random();
                     while (!stop.get()) {
                         final int key = r.nextInt(20000);
-                        try {
-                            cache.get(key, new Callable<Integer>() {
-
-                                @Override
-                                public Integer call() throws Exception {
-                                    return key;
-                                }
-
-                            });
-                        } catch (ExecutionException e) {
-                            count.set(Integer.MIN_VALUE);
-                            stop.set(true);
-                        }
+                        cache.get(key, k -> k);
                         count.incrementAndGet();
                     }
                 }
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
index 46afc9ece7..3422b454bb 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
@@ -94,9 +94,9 @@ public class CacheStatsMetricsTest {
         }
 
         @Override
-        protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() {
-            return new org.apache.jackrabbit.guava.common.cache.CacheStats(
-                    HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT);
+        protected com.github.benmanes.caffeine.cache.stats.CacheStats getCurrentStats() {
+            return com.github.benmanes.caffeine.cache.stats.CacheStats.of(
+                    HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT, 0);
         }
 
         @Override
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 2f40074831..d3181fec85 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -945,6 +945,11 @@
         <version>1.19.0</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.ben-manes.caffeine</groupId>
+        <artifactId>caffeine</artifactId>
+        <version>3.1.8</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index 097fda54a2..91ac788c4b 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -54,6 +54,10 @@
             <artifactId>oak-shaded-guava</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-core</artifactId>
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
index 4443cee98b..c247a022bd 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreHelper.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.PriorityQueue;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index ba686f298e..9fc55165b5 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -100,6 +100,10 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
     <!-- Optional OSGi dependencies, used only when running within OSGi -->
     <dependency>
       <groupId>org.osgi</groupId>
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatistics.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatistics.java
index 240b22de89..f3aba08b7d 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatistics.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatistics.java
@@ -27,20 +27,17 @@ import java.util.concurrent.TimeUnit;
 
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 
-import org.apache.jackrabbit.guava.common.base.Ticker;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Ticker;
 import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper;
-import org.apache.jackrabbit.oak.commons.internal.concurrent.FutureConverter;
 import org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexUtils;
 import org.apache.jackrabbit.oak.plugins.index.search.IndexStatistics;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.CacheLoader;
-import org.apache.jackrabbit.guava.common.cache.LoadingCache;
-import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture;
-
 import co.elastic.clients.elasticsearch._types.Bytes;
 import co.elastic.clients.elasticsearch.cat.indices.IndicesRecord;
 import co.elastic.clients.elasticsearch.core.CountRequest;
@@ -100,7 +97,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      */
     @Override
     public int numDocs() {
-        return countCache.getUnchecked(new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias()));
+        return countCache.get(new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias()));
     }
 
     /**
@@ -110,7 +107,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
     @Override
     public int getDocCountFor(String field) {
         String elasticField = ElasticIndexUtils.fieldName(field);
-        return countCache.getUnchecked(
+        return countCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias(), elasticField, null)
         );
     }
@@ -120,7 +117,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * {@code ElasticIndexDefinition}.
      */
     public int getDocCountFor(Query query) {
-        return countCache.getUnchecked(
+        return countCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias(), null, query)
         );
     }
@@ -130,7 +127,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * {@code ElasticIndexDefinition}.
      */
     public long primaryStoreSize() {
-        return statsCache.getUnchecked(
+        return statsCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias())
         ).primaryStoreSize;
     }
@@ -140,7 +137,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * primary shards and replica shards.
      */
     public long storeSize() {
-        return statsCache.getUnchecked(
+        return statsCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias())
         ).storeSize;
     }
@@ -149,7 +146,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * Returns the creation date for the remote index bound to the {@code ElasticIndexDefinition}.
      */
     public long creationDate() {
-        return statsCache.getUnchecked(
+        return statsCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias())
         ).creationDate;
     }
@@ -159,7 +156,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * {@code ElasticIndexDefinition}. This document count includes hidden nested documents.
      */
     public int luceneNumDocs() {
-        return statsCache.getUnchecked(
+        return statsCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias())
         ).luceneDocsCount;
     }
@@ -169,7 +166,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
      * {@code ElasticIndexDefinition}. This document count includes hidden nested documents.
      */
     public int luceneNumDeletedDocs() {
-        return statsCache.getUnchecked(
+        return statsCache.get(
                 new StatsRequestDescriptor(elasticConnection, indexDefinition.getIndexAlias())
         ).luceneDocsDeleted;
     }
@@ -178,22 +175,18 @@ public class ElasticIndexStatistics implements IndexStatistics {
         return setupCache(maxSize, expireSeconds, refreshSeconds, new CountCacheLoader(), clock);
     }
 
+    @SuppressWarnings("unchecked")
     static <K, V> LoadingCache<K, V> setupCache(long maxSize, long expireSeconds, long refreshSeconds,
                                                 @NotNull CacheLoader<K, V> cacheLoader, @Nullable Clock clock) {
-        CacheBuilder<Object, Object> cacheBuilder = CacheBuilder.newBuilder()
+        Caffeine<Object, Object> cacheBuilder = Caffeine.newBuilder()
                 .maximumSize(maxSize)
                 .expireAfterWrite(expireSeconds, TimeUnit.SECONDS)
                 // https://github.com/google/guava/wiki/CachesExplained#refresh
                 .refreshAfterWrite(refreshSeconds, TimeUnit.SECONDS);
         if (clock != null) {
-            cacheBuilder.ticker(new Ticker() {
-                @Override
-                public long read() {
-                    return TimeUnit.MILLISECONDS.toNanos(clock.millis());
-                }
-            });
+            cacheBuilder.ticker(() -> TimeUnit.MILLISECONDS.toNanos(clock.millis()));
         }
-        return cacheBuilder.build(cacheLoader);
+        return ((Caffeine<K, V>) cacheBuilder).build(cacheLoader);
     }
 
     private Long getCacheMaxSize() {
@@ -208,7 +201,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
         return Long.getLong(REFRESH_SECONDS, REFRESH_SECONDS_DEFAULT);
     }
 
-    static class CountCacheLoader extends CacheLoader<StatsRequestDescriptor, Integer> {
+    static class CountCacheLoader implements CacheLoader<StatsRequestDescriptor, Integer> {
 
         @Override
         public @NotNull Integer load(@NotNull StatsRequestDescriptor countRequestDescriptor) throws IOException {
@@ -216,15 +209,15 @@ public class ElasticIndexStatistics implements IndexStatistics {
         }
 
         @Override
-        public @NotNull ListenableFuture<Integer> reload(@NotNull StatsRequestDescriptor crd, @NotNull Integer oldValue) {
-            CompletableFuture<Integer> task = CompletableFuture.supplyAsync(() -> {
+        public @NotNull CompletableFuture<Integer> asyncReload(@NotNull StatsRequestDescriptor crd, @NotNull Integer oldValue,
+                                                               @NotNull java.util.concurrent.Executor executor) {
+            return CompletableFuture.supplyAsync(() -> {
                 try {
                     return count(crd);
                 } catch (IOException e) {
                     throw new CompletionException(e);
                 }
             }, REFRESH_EXECUTOR);
-            return FutureConverter.toListenableFuture(task);
         }
 
         private int count(StatsRequestDescriptor crd) throws IOException {
@@ -241,7 +234,7 @@ public class ElasticIndexStatistics implements IndexStatistics {
         }
     }
 
-    static class StatsCacheLoader extends CacheLoader<StatsRequestDescriptor, StatsResponse> {
+    static class StatsCacheLoader implements CacheLoader<StatsRequestDescriptor, StatsResponse> {
 
         @Override
         public @NotNull StatsResponse load(@NotNull StatsRequestDescriptor countRequestDescriptor) throws IOException {
@@ -249,15 +242,15 @@ public class ElasticIndexStatistics implements IndexStatistics {
         }
 
         @Override
-        public @NotNull ListenableFuture<StatsResponse> reload(@NotNull StatsRequestDescriptor crd, @NotNull StatsResponse oldValue) {
-            CompletableFuture<StatsResponse> task = CompletableFuture.supplyAsync(() -> {
+        public @NotNull CompletableFuture<StatsResponse> asyncReload(@NotNull StatsRequestDescriptor crd, @NotNull StatsResponse oldValue,
+                                                                     @NotNull java.util.concurrent.Executor executor) {
+            return CompletableFuture.supplyAsync(() -> {
                 try {
                     return stats(crd);
                 } catch (IOException e) {
                     throw new CompletionException(e);
                 }
             }, REFRESH_EXECUTOR);
-            return FutureConverter.toListenableFuture(task);
         }
 
         private StatsResponse stats(StatsRequestDescriptor crd) throws IOException {
diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
index 644e88ed3c..302e6e72a5 100644
--- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
+++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
@@ -20,7 +20,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import co.elastic.clients.elasticsearch.core.CountRequest;
 import co.elastic.clients.elasticsearch.core.CountResponse;
-import org.apache.jackrabbit.guava.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
 import org.junit.Before;
diff --git a/oak-search/pom.xml b/oak-search/pom.xml
index 1610cc444b..946efe7b20 100644
--- a/oak-search/pom.xml
+++ b/oak-search/pom.xml
@@ -75,6 +75,10 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-commons</artifactId>
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
index 57911f6a2f..5509ca5f7f 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
@@ -36,9 +36,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.commons.IOUtils;
@@ -103,7 +103,7 @@ public class ExtractedTextCache {
     public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysUsePreExtractedCache,
                               File indexDir, StatisticsProvider statisticsProvider) {
         if (maxWeight > 0) {
-            cache = CacheBuilder.newBuilder()
+            cache = Caffeine.newBuilder()
                     .weigher(EmpiricalWeigher.INSTANCE)
                     .maximumWeight(maxWeight)
                     .expireAfterAccess(expiryTimeInSecs, TimeUnit.SECONDS)
diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml
index 66c551f50d..d8752e0164 100644
--- a/oak-segment-tar/pom.xml
+++ b/oak-segment-tar/pom.xml
@@ -176,6 +176,10 @@
             <artifactId>oak-shaded-guava</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
 
         <!-- Dependencies on Oak modules -->
         <dependency>
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
index 38033a2148..9558215061 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segment;
 
 import static org.apache.jackrabbit.oak.commons.StringUtils.estimateMemoryUsage;
 
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.segment.ReaderCache.CacheKey;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
index 0acaa9d10e..8a28f4f986 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
@@ -25,7 +25,7 @@ import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
 import java.util.Arrays;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.jetbrains.annotations.NotNull;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
index 90e83a0161..ce0f2002f4 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
@@ -23,10 +23,10 @@ import static java.util.Objects.requireNonNull;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.guava.common.cache.RemovalListener;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.Weigher;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -112,7 +112,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
 
         @Override
         public @NotNull CacheStats getStats() {
-            return new CacheStats(0, missCount.sum(), 0, 0, 0, 0);
+            return CacheStats.of(0, missCount.sum(), 0, 0, 0, 0, 0);
         }
 
         @Override
@@ -137,7 +137,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
 
     private static class Default<K> extends RecordCache<K> {
         @NotNull
-        private final org.apache.jackrabbit.guava.common.cache.Cache<K, RecordId> cache;
+        private final com.github.benmanes.caffeine.cache.Cache<K, RecordId> cache;
 
         @NotNull
         private final Weigher<K, RecordId> weigher;
@@ -150,8 +150,8 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
         public @NotNull CacheStats getStats() {
             CacheStats internalStats = cache.stats();
             // any addition to the cache counts as load by our definition
-            return new CacheStats(internalStats.hitCount(), internalStats.missCount(),
-                    loadCount.sum(), 0, 0,  internalStats.evictionCount());
+            return CacheStats.of(internalStats.hitCount(), internalStats.missCount(),
+                    loadCount.sum(), 0, 0, internalStats.evictionCount(), 0);
         }
 
         static <K> Supplier<RecordCache<K>> defaultFactory(final int size, @NotNull final Weigher<K, RecordId> weigher) {
@@ -159,14 +159,14 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
         }
 
         Default(final int size, @NotNull final Weigher<K, RecordId> weigher) {
-            this.cache = CacheBuilder.newBuilder()
+            this.cache = Caffeine.newBuilder()
                     .maximumSize(size * 4L / 3)
                     .initialCapacity(size)
-                    .concurrencyLevel(4)
                     .recordStats()
-                    .removalListener((RemovalListener<K, RecordId>) removal -> {
-                        int removedWeight = weigher.weigh(removal.getKey(), removal.getValue());
-                        weight.add(-removedWeight);
+                    .removalListener((K key, RecordId value, RemovalCause cause) -> {
+                        if (key != null && value != null) {
+                            weight.add(-weigher.weigh(key, value));
+                        }
                     })
                     .build();
             this.weigher = weigher;
@@ -186,7 +186,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
 
         @Override
         public long size() {
-            return cache.size();
+            return cache.estimatedSize();
         }
 
         @Override
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
index b5e92fce00..545c377206 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
@@ -22,7 +22,7 @@ import static java.util.Objects.requireNonNull;
 
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
index 41238c04b4..fc954ed1e8 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
@@ -23,15 +23,16 @@ import static java.util.Objects.requireNonNull;
 import static org.apache.jackrabbit.oak.segment.CacheWeights.segmentWeight;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.guava.common.cache.RemovalNotification;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
 import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher;
 import org.jetbrains.annotations.NotNull;
@@ -131,25 +132,27 @@ public abstract class SegmentCache {
          */
         private NonEmptyCache(long cacheSizeMB) {
             long maximumWeight = cacheSizeMB * 1024 * 1024;
-            this.cache = CacheBuilder.newBuilder()
-                    .concurrencyLevel(16)
+            this.cache = Caffeine.newBuilder()
                     .maximumWeight(maximumWeight)
                     .weigher(new SegmentCacheWeigher())
+                    // Use inline executor so removal listeners fire synchronously,
+                    // matching Guava's behaviour (needed for id.unloaded() timing).
+                    .executor(Runnable::run)
                     .removalListener(this::onRemove)
                     .build();
-            this.stats = new Stats(NAME, maximumWeight, cache::size);
+            this.stats = new Stats(NAME, maximumWeight, cache::estimatedSize);
         }
 
         /**
          * Removal handler called whenever an item is evicted from the cache.
          */
-        private void onRemove(@NotNull RemovalNotification<SegmentId, Segment> notification) {
+        private void onRemove(SegmentId key, Segment value, RemovalCause cause) {
             stats.evictionCount.incrementAndGet();
-            if (notification.getValue() != null) {
-                stats.currentWeight.addAndGet(-segmentWeight(notification.getValue()));
+            if (value != null) {
+                stats.currentWeight.addAndGet(-segmentWeight(value));
             }
-            if (notification.getKey() != null) {
-                notification.getKey().unloaded();
+            if (key != null) {
+                key.unloaded();
             }
         }
 
@@ -157,21 +160,31 @@ public abstract class SegmentCache {
         @NotNull
         public Segment getSegment(@NotNull SegmentId id, @NotNull Callable<Segment> loader) throws ExecutionException {
             if (id.isDataSegmentId()) {
-                return cache.get(id, () -> {
-                    try {
-                        long t0 = System.nanoTime();
-                        Segment segment = loader.call();
-                        stats.loadSuccessCount.incrementAndGet();
-                        stats.loadTime.addAndGet(System.nanoTime() - t0);
-                        stats.missCount.incrementAndGet();
-                        stats.currentWeight.addAndGet(segmentWeight(segment));
-                        id.loaded(segment);
-                        return segment;
-                    } catch (Exception e) {
-                        stats.loadExceptionCount.incrementAndGet();
-                        throw e;
-                    }
-                });
+                try {
+                    return cache.get(id, segmentId -> {
+                        try {
+                            long t0 = System.nanoTime();
+                            Segment segment = loader.call();
+                            stats.loadSuccessCount.incrementAndGet();
+                            stats.loadTime.addAndGet(System.nanoTime() - t0);
+                            stats.missCount.incrementAndGet();
+                            stats.currentWeight.addAndGet(segmentWeight(segment));
+                            id.loaded(segment);
+                            return segment;
+                        } catch (Exception e) {
+                            stats.loadExceptionCount.incrementAndGet();
+                            if (e instanceof RuntimeException) {
+                                throw (RuntimeException) e;
+                            }
+                            throw new RuntimeException(e);
+                        }
+                    });
+                } catch (CompletionException e) {
+                    Throwable cause = e.getCause();
+                    throw new ExecutionException(
+                            cause instanceof RuntimeException && cause.getCause() != null
+                                    ? cause.getCause() : cause);
+                }
             } else {
                 try {
                     return loader.call();
@@ -195,12 +208,17 @@ public abstract class SegmentCache {
                 id.loaded(segment);
                 stats.currentWeight.addAndGet(segmentWeight(segment));
                 cache.put(id, segment);
+                // Force Caffeine to process pending evictions synchronously,
+                // so the removal listener fires before returning to the caller.
+                cache.cleanUp();
             }
         }
 
         @Override
         public void clear() {
             cache.invalidateAll();
+            // Force removal listener notifications to fire synchronously.
+            cache.cleanUp();
         }
 
         @Override
@@ -297,13 +315,14 @@ public abstract class SegmentCache {
 
         @Override
         protected CacheStats getCurrentStats() {
-            return new CacheStats(
+            return CacheStats.of(
                     hitCount.get(),
                     missCount.get(),
                     loadSuccessCount.get(),
                     loadExceptionCount.get(),
                     loadTime.get(),
-                    evictionCount.get()
+                    evictionCount.get(),
+                    0
             );
         }
 
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
index a0d4ba9b33..fe76e67f3a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
 import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.segment.file.PriorityCache;
@@ -356,7 +356,7 @@ public abstract class WriterCacheManager {
             return new Supplier<CacheStats>() {
                 @Override
                 public CacheStats get() {
-                    CacheStats stats = new CacheStats(0, 0, 0, 0, 0, 0);
+                    CacheStats stats = CacheStats.empty();
                     for (RecordCache<?> cache : caches) {
                         stats = stats.plus(cache.getStats());
                     }
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
index afc9716206..9cf996082d 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
@@ -37,8 +37,8 @@ import org.apache.jackrabbit.oak.segment.CacheWeights;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
+import com.github.benmanes.caffeine.cache.Weigher;
 
 /**
  * {@code PriorityCache} implements a partial mapping from keys of type {@code K} to values
@@ -401,8 +401,8 @@ public class PriorityCache<K, V> {
      */
     @NotNull
     public CacheStats getStats() {
-        return new CacheStats(hitCount.sum(), missCount.sum(), loadCount.sum(),
-                loadExceptionCount.sum(), 0, evictionCount.sum());
+        return CacheStats.of(hitCount.sum(), missCount.sum(), loadCount.sum(),
+                loadExceptionCount.sum(), 0, evictionCount.sum(), 0);
     }
 
     public long estimateCurrentWeight() {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
index 541e31aa82..4f8f0a7982 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
 import org.jetbrains.annotations.NotNull;
 
@@ -68,13 +68,14 @@ public class SegmentCacheStats extends AbstractCacheStats {
 
     @Override
     protected CacheStats getCurrentStats() {
-        return new CacheStats(
+        return CacheStats.of(
                 hitCount.get(),
                 missCount.get(),
                 loadSuccessCount.get(),
                 loadExceptionCount.get(),
                 loadTime.get(),
-                evictionCount.get()
+                evictionCount.get(),
+                0
         );
     }
 
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
index 0ad0171f1b..96eb50916c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 @Internal(since = "1.0.0")
-@Version("6.1.0")
+@Version("7.0.0")
 package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache;
 
 import org.apache.jackrabbit.oak.commons.annotations.Internal;
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java
index cab79e0edf..f9d90fa14d 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java
@@ -230,7 +230,7 @@ public class ConcurrentPriorityCacheTest {
 
         assertEquals(0, cache.getStats().evictionCount());
         assertEquals(success, cache.size());
-        assertEquals(failure, cache.getStats().loadExceptionCount());
+        assertEquals(failure, cache.getStats().loadFailureCount());
     }
 
 }
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
index 2eafe8e1d7..0d63f73a14 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assume.assumeTrue;
 
 import java.util.Random;
 
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Weigher;
 import org.apache.jackrabbit.oak.segment.CacheWeights;
 import org.junit.Test;
 
@@ -191,7 +191,7 @@ public class PriorityCacheTest {
 
         assertEquals(0, cache.getStats().evictionCount());
         assertEquals(success, cache.size());
-        assertEquals(failure, cache.getStats().loadExceptionCount());
+        assertEquals(failure, cache.getStats().loadFailureCount());
     }
 
 }
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java
index 7732472daf..211690ecf0 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java
@@ -19,7 +19,8 @@ package org.apache.jackrabbit.oak.plugins.document;
 import java.util.List;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.stats.Clock;
@@ -27,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.jackrabbit.guava.common.cache.CacheBuilder.newBuilder;
 
 /**
  * Resolves the commit value for a given change revision on a document.
@@ -44,7 +44,7 @@ final class CachingCommitValueResolver implements CommitValueResolver {
     private final Supplier<RevisionVector> sweepRevisions;
 
     CachingCommitValueResolver(int cacheSize, Supplier<RevisionVector> sweepRevisions) {
-        this.commitValueCache = newBuilder().maximumSize(cacheSize).build();
+        this.commitValueCache = Caffeine.newBuilder().maximumSize(cacheSize).build();
         this.cacheSize = cacheSize;
         this.sweepRevisions = sweepRevisions;
     }
@@ -56,7 +56,7 @@ final class CachingCommitValueResolver implements CommitValueResolver {
             return new CommitValueResolver() {
 
                 private final Cache<Revision, String> emptyCommitValueCache
-                        = newBuilder().maximumSize(cacheSize).build();
+                        = Caffeine.newBuilder().maximumSize(cacheSize).build();
 
                 @Override
                 public String resolve(@NotNull Revision changeRevision,
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index ef537564dd..066706d4c1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -56,10 +56,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -74,7 +72,7 @@ import java.util.function.Supplier;
 import javax.jcr.PropertyType;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -1394,25 +1392,22 @@ public final class DocumentNodeStore
         final long start = PERFLOG.start();
         try {
             PathRev key = new PathRev(path, rev);
-            DocumentNodeState node = nodeCache.get(key, new Callable<DocumentNodeState>() {
-                @Override
-                public DocumentNodeState call() throws Exception {
-                    boolean nodeDoesNotExist = checkNodeNotExistsFromChildrenCache(path, rev);
-                    if (nodeDoesNotExist){
-                        return missing;
-                    }
-                    DocumentNodeState n = readNode(path, rev);
-                    if (n == null) {
-                        n = missing;
-                    }
-                    return n;
+            DocumentNodeState node = nodeCache.get(key, k -> {
+                boolean nodeDoesNotExist = checkNodeNotExistsFromChildrenCache(path, rev);
+                if (nodeDoesNotExist){
+                    return missing;
                 }
+                DocumentNodeState n = readNode(path, rev);
+                if (n == null) {
+                    n = missing;
+                }
+                return n;
             });
             final DocumentNodeState result = node == missing
                     || node.equals(missing) ? null : node;
             PERFLOG.end(start, 1, "getNode: path={}, rev={}", path, rev);
             return result;
-        } catch (RuntimeException | ExecutionException e) {
+        } catch (RuntimeException e) {
             throw DocumentStoreException.convert(e.getCause());
         }
     }
@@ -1456,12 +1451,7 @@ public final class DocumentNodeStore
         final RevisionVector readRevision = parent.getLastRevision();
         try {
             NamePathRev key = childNodeCacheKey(path, readRevision, name);
-            DocumentNodeState.Children children = nodeChildrenCache.get(key, new Callable<DocumentNodeState.Children>() {
-                @Override
-                public DocumentNodeState.Children call() throws Exception {
-                    return readChildren(parent, name, limit);
-                }
-            });
+            DocumentNodeState.Children children = nodeChildrenCache.get(key, k -> readChildren(parent, name, limit));
             if (children.children.size() < limit && children.hasMore) {
                 // not enough children loaded - load more,
                 // and put that in the cache
@@ -1471,7 +1461,7 @@ public final class DocumentNodeStore
                 nodeChildrenCache.put(key, children);
             }
             return children;
-        } catch (RuntimeException | ExecutionException e) {
+        } catch (RuntimeException e) {
             throw DocumentStoreException.convert(e.getCause(),
                     "Error occurred while fetching children for path "
                             + path);
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
index bb5f34c5ba..697c84078b 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
@@ -35,12 +35,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.cache.RemovalListener;
-import org.apache.jackrabbit.guava.common.cache.RemovalNotification;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import com.github.benmanes.caffeine.cache.Cache;
+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 org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -1151,19 +1150,17 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> {
                     }).
                     build();
         }
-        return CacheBuilder.newBuilder().
-                concurrencyLevel(cacheSegmentCount).
-                weigher(weigher).
+        Weigher<K, V> typedWeigher = (key, value) -> weigher.weigh(key, value);
+        RemovalListener<K, V> typedListener = (key, value, cause) -> {
+            for (EvictionListener<K, V> l : listeners) {
+                l.evicted(key, value, cause);
+            }
+        };
+        return Caffeine.newBuilder().
+                weigher(typedWeigher).
                 maximumWeight(maxWeight).
                 recordStats().
-                removalListener(new RemovalListener<K, V>() {
-                    @Override
-                    public void onRemoval(RemovalNotification<K, V> notification) {
-                        for (EvictionListener<K, V> l : listeners) {
-                            l.evicted(notification.getKey(), notification.getValue(), notification.getCause());
-                        }
-                    }
-                }).
+                removalListener(typedListener).
                 build();
     }
 
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
index b9adddd66b..499e6fe655 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
index 251c931d61..ae4823c73c 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
@@ -17,10 +17,8 @@
 package org.apache.jackrabbit.oak.plugins.document;
 
 import java.util.Collections;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
@@ -75,21 +73,13 @@ public class MemoryDiffCache extends DiffCache {
                 diff = StringValue.EMPTY;
             }
         } else {
-            try {
-                diff = diffCache.get(key, new Callable<StringValue>() {
-                    @Override
-                    public StringValue call() throws Exception {
-                        if (isUnchanged(from, to, path)) {
-                            return StringValue.EMPTY;
-                        } else {
-                            return new StringValue(loader.call());
-                        }
-                    }
-                });
-            } catch (ExecutionException e) {
-                // try again with loader directly
-                diff = new StringValue(loader.call());
-            }
+            diff = diffCache.get(key, k -> {
+                if (isUnchanged(from, to, path)) {
+                    return StringValue.EMPTY;
+                } else {
+                    return new StringValue(loader.call());
+                }
+            });
         }
         return diff != null ? diff.toString() : null;
     }
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
index 0ed7a425a2..ae6a210b72 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.commons.collections.AbstractIterator;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.PathUtils;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
index 6da5c935c0..2e5f3e5744 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
@@ -38,7 +38,7 @@ class TieredDiffCache extends DiffCache {
      * the same revision vector range.
      */
     private Cache<RevisionsKey, RevisionsKey> localDiffMisses
-            = CacheBuilder.newBuilder().maximumSize(128).build();
+            = Caffeine.newBuilder().maximumSize(128).build();
 
     private final int clusterId;
     private final DiffCache localCache;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/ForwardingListener.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/ForwardingListener.java
index 1a59bcdd4a..564f4d5bfd 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/ForwardingListener.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/ForwardingListener.java
@@ -19,8 +19,8 @@
 
 package org.apache.jackrabbit.oak.plugins.document.cache;
 
-import org.apache.jackrabbit.guava.common.cache.RemovalListener;
-import org.apache.jackrabbit.guava.common.cache.RemovalNotification;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalListener;
 
 /**
  * Listener which forwards the notifications to a delegate. It is used to bridge
@@ -39,9 +39,9 @@ public class ForwardingListener<K, V>
     }
 
     @Override
-    public void onRemoval(RemovalNotification<K, V> notification) {
+    public void onRemoval(K key, V value, RemovalCause cause) {
         if (delegate != null) {
-            delegate.onRemoval(notification);
+            delegate.onRemoval(key, value, cause);
         }
     }
 
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
index b970434b0a..82d11838cf 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
@@ -28,12 +28,13 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.Lock;
 import java.util.function.Predicate;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
@@ -161,7 +162,6 @@ public class NodeDocumentCache implements Closeable {
      * is not synchronized and will be faster if you need to get the cached value
      * outside the critical section.
      *
-     * @see Cache#get(Object, Callable)
      * @param key document key
      * @param valueLoader object used to retrieve the document
      * @return document matching given key
@@ -169,21 +169,26 @@ public class NodeDocumentCache implements Closeable {
     @NotNull
     public NodeDocument get(@NotNull final String key, @NotNull final Callable<NodeDocument> valueLoader)
             throws ExecutionException {
-        Callable<NodeDocument> wrappedLoader = new Callable<NodeDocument>() {
-            @Override
-            public NodeDocument call() throws Exception {
-                for (CacheChangesTracker tracker : changeTrackers) {
-                    tracker.invalidateDocument(key);
-                }
-                return valueLoader.call();
-            }
-        };
         Lock lock = locks.acquire(key);
         try {
-            if (isLeafPreviousDocId(key)) {
-                return prevDocumentsCache.get(new StringValue(key), wrappedLoader);
-            } else {
-                return nodeDocumentsCache.get(new StringValue(key), wrappedLoader);
+            @SuppressWarnings("unchecked")
+            Cache<CacheValue, NodeDocument> targetCache =
+                    isLeafPreviousDocId(key)
+                            ? (Cache<CacheValue, NodeDocument>)(Cache<?,?>) prevDocumentsCache
+                            : nodeDocumentsCache;
+            try {
+                return targetCache.get(new StringValue(key), k -> {
+                    try {
+                        for (CacheChangesTracker tracker : changeTrackers) {
+                            tracker.invalidateDocument(key);
+                        }
+                        return valueLoader.call();
+                    } catch (Exception e) {
+                        throw new CompletionException(e);
+                    }
+                });
+            } catch (CompletionException e) {
+                throw new ExecutionException(e.getCause());
             }
         } finally {
             lock.unlock();
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/EvictionListener.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/EvictionListener.java
index 579b58a34d..c3e91655b1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/EvictionListener.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/EvictionListener.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.plugins.document.persistentCache;
 
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalCause;
 
 /**
  * A listener that gets notified of entries that were removed from the cache.
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
index d9a61b1c52..b1e1eec413 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
@@ -17,23 +17,22 @@
 package org.apache.jackrabbit.oak.plugins.document.persistentCache;
 
 import static java.util.Collections.singleton;
-import static org.apache.jackrabbit.guava.common.cache.RemovalCause.COLLECTED;
-import static org.apache.jackrabbit.guava.common.cache.RemovalCause.EXPIRED;
-import static org.apache.jackrabbit.guava.common.cache.RemovalCause.SIZE;
+import static com.github.benmanes.caffeine.cache.RemovalCause.COLLECTED;
+import static com.github.benmanes.caffeine.cache.RemovalCause.EXPIRED;
+import static com.github.benmanes.caffeine.cache.RemovalCause.SIZE;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Policy;
+import com.github.benmanes.caffeine.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -187,11 +186,10 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     @Nullable
-    public V getIfPresent(Object key) {
-        memCacheMetadata.increment((K) key);
+    public V getIfPresent(K key) {
+        memCacheMetadata.increment(key);
         V value = memCache.getIfPresent(key);
         if (value == null) {
             memCacheMetadata.remove(key);
@@ -208,19 +206,16 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
         stats.markRequest();
 
         // it takes care of updating memCacheMetadata
-        value = readIfPresent((K) key);
+        value = readIfPresent(key);
         if (value != null) {
-            memCache.put((K) key, value);
+            memCache.put(key, value);
             stats.markHit();
         }
         return value;
     }
 
     @Override
-    public V get(K key,
-            Callable<? extends V> valueLoader)
-            throws ExecutionException {
-
+    public V get(K key, Function<? super K, ? extends V> mappingFunction) {
         // Get stats covered in getIfPresent
         V value = getIfPresent(key);
         if (value != null) {
@@ -231,29 +226,35 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
         TimerStats.Context ctx = stats.startLoaderTimer();
         try {
             memCacheMetadata.increment(key);
-            value = memCache.get(key, valueLoader);
+            value = memCache.get(key, mappingFunction);
             ctx.stop();
             if (!async) {
                 write((K) key, value);
             }
             broadcast(key, value);
             return value;
-        } catch (ExecutionException e) {
+        } catch (RuntimeException e) {
             stats.markException();
             throw e;
-         }
+        }
     }
 
     @Override
-    public ImmutableMap<K, V> getAllPresent(
-            Iterable<?> keys) {
+    @SuppressWarnings("unchecked")
+    public Map<K, V> getAllPresent(Iterable<? extends K> keys) {
         Iterable<K> typedKeys = (Iterable<K>) keys;
         memCacheMetadata.incrementAll(keys);
-        ImmutableMap<K, V> result = memCache.getAllPresent(keys);
+        Map<K, V> result = memCache.getAllPresent(keys);
         memCacheMetadata.removeAll(IterableUtils.filter(typedKeys, x -> !result.keySet().contains(x)));
         return result;
     }
 
+    @Override
+    public Map<K, V> getAll(Iterable<? extends K> keys,
+            Function<? super Set<? extends K>, ? extends Map<? extends K, ? extends V>> mappingFunction) {
+        return memCache.getAll(keys, mappingFunction);
+    }
+
     @Override
     public void put(K key, V value) {
         memCacheMetadata.put(key);
@@ -264,17 +265,16 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
         broadcast(key, value);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public void invalidate(Object key) {
+    public void invalidate(K key) {
         memCache.invalidate(key);
         memCacheMetadata.remove(key);
         if (async) {
-            writeQueue.addInvalidate(singleton((K) key));
+            writeQueue.addInvalidate(singleton(key));
         } else {
-            write((K) key, null);
+            write(key, null);
         }
-        broadcast((K) key, null);
+        broadcast(key, null);
         stats.markInvalidateOne();
     }
 
@@ -285,7 +285,8 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
     }
 
     @Override
-    public void invalidateAll(Iterable<?> keys) {
+    @SuppressWarnings("unchecked")
+    public void invalidateAll(Iterable<? extends K> keys) {
         memCache.invalidateAll(keys);
         memCacheMetadata.removeAll(keys);
     }
@@ -299,8 +300,8 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
     }
 
     @Override
-    public long size() {
-        return memCache.size();
+    public long estimatedSize() {
+        return memCache.estimatedSize();
     }
 
     @Override
@@ -308,6 +309,11 @@ class NodeCache<K extends CacheValue, V extends  CacheValue>
         return memCache.stats();
     }
 
+    @Override
+    public Policy<K, V> policy() {
+        return memCache.policy();
+    }
+
     @Override
     public ConcurrentMap<K, V> asMap() {
         return memCache.asMap();
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
index 16df03a212..d3d2bdec58 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AsyncCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AsyncCacheTest.java
index b983a1b7cd..98fd0438c6 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AsyncCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AsyncCacheTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull;
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.junit.Rule;
 import org.junit.Test;
 
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
index 15e6df0ee0..9553cd53e3 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.collections.SetUtils;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
index 6abbbb2731..ab06777bcf 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DisableCacheTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -50,6 +50,6 @@ public class DisableCacheTest {
                 DEFAULT_PREV_NO_PROP_CACHE_PERCENTAGE);
         DocumentNodeStore nodeStore = builder.getNodeStore();
         Cache<PathRev, DocumentNodeState> cache = nodeStore.getNodeCache();
-        assertEquals(0, cache.size());
+        assertEquals(0, cache.estimatedSize());
     }
 }
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/Sweep2Test.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/Sweep2Test.java
index 97549e9951..d5e73cecc9 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/Sweep2Test.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/Sweep2Test.java
@@ -47,7 +47,7 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 
 import junitx.util.PrivateAccessor;
 
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index 8950951f9e..5b41400b95 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -101,7 +101,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.commons.collections.AbstractIterator;
 import com.mongodb.ReadPreference;
 
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
index 713ed7d3c2..930d326cb5 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
@@ -27,7 +27,7 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.cache.CacheStats;
 import org.apache.jackrabbit.oak.cache.CacheValue;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
index 726c2978e1..f2fefe9735 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
@@ -19,7 +19,7 @@
 package org.apache.jackrabbit.oak.plugins.document.persistentCache;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalCause;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.commons.collections.ListUtils;
 import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BroadcastTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BroadcastTest.java
index 8a4e9474ef..d196005819 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BroadcastTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/BroadcastTest.java
@@ -24,7 +24,7 @@ import java.io.File;
 import java.util.concurrent.Callable;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.plugins.document.MemoryDiffCache.Key;
 import org.apache.jackrabbit.oak.plugins.document.Path;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
index 907dcce08e..8b7e4d5996 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
@@ -26,7 +26,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.guava.common.cache.Cache;
+import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.jackrabbit.oak.cache.CacheLIRS;
 import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
 import org.apache.jackrabbit.oak.plugins.document.Path;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java
index e82c118693..aa29b33376 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Consumer;
 
-import org.apache.jackrabbit.guava.common.cache.RemovalCause;
+import com.github.benmanes.caffeine.cache.RemovalCause;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
 import org.apache.jackrabbit.oak.json.JsopDiff;