diff --git a/common/build.gradle b/common/build.gradle
index de7d2d495..b4799ec89 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -51,6 +51,7 @@ artifacts {
 dependencies {
   def deps = rootProject.dependencyMap
 
+  compile deps['com.github.ben-manes.caffeine:caffeine']
   compile deps['com.google.code.findbugs:jsr305']
   compile deps['com.google.guava:guava']
   compile deps['javax.inject:javax.inject']
diff --git a/common/gradle/dependency-locks/compile.lockfile b/common/gradle/dependency-locks/compile.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/compile.lockfile
+++ b/common/gradle/dependency-locks/compile.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/compileClasspath.lockfile b/common/gradle/dependency-locks/compileClasspath.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/compileClasspath.lockfile
+++ b/common/gradle/dependency-locks/compileClasspath.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/default.lockfile b/common/gradle/dependency-locks/default.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/default.lockfile
+++ b/common/gradle/dependency-locks/default.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/deploy_jar.lockfile b/common/gradle/dependency-locks/deploy_jar.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/deploy_jar.lockfile
+++ b/common/gradle/dependency-locks/deploy_jar.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/runtime.lockfile b/common/gradle/dependency-locks/runtime.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/runtime.lockfile
+++ b/common/gradle/dependency-locks/runtime.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/runtimeClasspath.lockfile b/common/gradle/dependency-locks/runtimeClasspath.lockfile
index 521b55f9e..976057db3 100644
--- a/common/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,12 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
diff --git a/common/gradle/dependency-locks/testCompile.lockfile b/common/gradle/dependency-locks/testCompile.lockfile
index 43ee55816..7ae05a3fe 100644
--- a/common/gradle/dependency-locks/testCompile.lockfile
+++ b/common/gradle/dependency-locks/testCompile.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -16,7 +17,7 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
diff --git a/common/gradle/dependency-locks/testCompileClasspath.lockfile b/common/gradle/dependency-locks/testCompileClasspath.lockfile
index 43ee55816..7ae05a3fe 100644
--- a/common/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -16,7 +17,7 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
diff --git a/common/gradle/dependency-locks/testRuntime.lockfile b/common/gradle/dependency-locks/testRuntime.lockfile
index 6ce21b0d7..8ef44db2b 100644
--- a/common/gradle/dependency-locks/testRuntime.lockfile
+++ b/common/gradle/dependency-locks/testRuntime.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -17,7 +18,7 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
diff --git a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 6ce21b0d7..8ef44db2b 100644
--- a/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -17,7 +18,7 @@ joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.apiguardian:apiguardian-api:1.1.0
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
diff --git a/common/gradle/dependency-locks/testingCompile.lockfile b/common/gradle/dependency-locks/testingCompile.lockfile
index d528dba82..769d3f47b 100644
--- a/common/gradle/dependency-locks/testingCompile.lockfile
+++ b/common/gradle/dependency-locks/testingCompile.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -15,6 +16,6 @@ javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.ow2.asm:asm:9.0
diff --git a/common/gradle/dependency-locks/testingCompileClasspath.lockfile b/common/gradle/dependency-locks/testingCompileClasspath.lockfile
index d528dba82..769d3f47b 100644
--- a/common/gradle/dependency-locks/testingCompileClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingCompileClasspath.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -15,6 +16,6 @@ javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.ow2.asm:asm:9.0
diff --git a/common/gradle/dependency-locks/testingRuntime.lockfile b/common/gradle/dependency-locks/testingRuntime.lockfile
index cd7bee4f2..2474dd307 100644
--- a/common/gradle/dependency-locks/testingRuntime.lockfile
+++ b/common/gradle/dependency-locks/testingRuntime.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -16,6 +17,6 @@ javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.ow2.asm:asm:9.0
diff --git a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
index cd7bee4f2..2474dd307 100644
--- a/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
+++ b/common/gradle/dependency-locks/testingRuntimeClasspath.lockfile
@@ -1,9 +1,10 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.auto.value:auto-value-annotations:1.7.4
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.5.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -16,6 +17,6 @@ javax.inject:javax.inject:1
 joda-time:joda-time:2.9.2
 junit:junit:4.13.1
 org.checkerframework:checker-compat-qual:2.5.3
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.hamcrest:hamcrest-core:1.3
 org.ow2.asm:asm:9.0
diff --git a/common/src/testing/java/google/registry/testing/SystemInfo.java b/common/src/testing/java/google/registry/testing/SystemInfo.java
index b4460e318..944daea45 100644
--- a/common/src/testing/java/google/registry/testing/SystemInfo.java
+++ b/common/src/testing/java/google/registry/testing/SystemInfo.java
@@ -14,9 +14,9 @@
 
 package google.registry.testing;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.flogger.FluentLogger;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -29,7 +29,7 @@ public final class SystemInfo {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   private static final LoadingCache<String, Boolean> hasCommandCache =
-      CacheBuilder.newBuilder()
+      Caffeine.newBuilder()
           .build(
               new CacheLoader<String, Boolean>() {
                 @Override
diff --git a/core/src/main/java/google/registry/model/ModelUtils.java b/core/src/main/java/google/registry/model/ModelUtils.java
index ed4401d14..e1b1fddbb 100644
--- a/core/src/main/java/google/registry/model/ModelUtils.java
+++ b/core/src/main/java/google/registry/model/ModelUtils.java
@@ -21,11 +21,9 @@ import static com.google.common.collect.Maps.transformValues;
 import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.Collectors.toList;
 
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
@@ -59,36 +57,33 @@ public class ModelUtils {
 
   /** Caches all instance fields on an object, including non-public and inherited fields. */
   private static final LoadingCache<Class<?>, ImmutableMap<String, Field>> ALL_FIELDS_CACHE =
-      CacheBuilder.newBuilder()
+      CacheUtils.newCacheBuilder()
           .build(
-              new CacheLoader<Class<?>, ImmutableMap<String, Field>>() {
-                @Override
-                public ImmutableMap<String, Field> load(Class<?> clazz) {
-                  Deque<Class<?>> hierarchy = new ArrayDeque<>();
-                  // Walk the hierarchy up to but not including ImmutableObject (to ignore
-                  // hashCode).
-                  for (; clazz != ImmutableObject.class; clazz = clazz.getSuperclass()) {
-                    // Add to the front, so that shadowed fields show up later in the list.
-                    // This will mean that getFieldValues will show the most derived value.
-                    hierarchy.addFirst(clazz);
-                  }
-                  Map<String, Field> fields = new LinkedHashMap<>();
-                  for (Class<?> hierarchyClass : hierarchy) {
-                    // Don't use hierarchyClass.getFields() because it only picks up public fields.
-                    for (Field field : hierarchyClass.getDeclaredFields()) {
-                      if (!Modifier.isStatic(field.getModifiers())) {
-                        field.setAccessible(true);
-                        fields.put(field.getName(), field);
-                      }
+              clazz -> {
+                Deque<Class<?>> hierarchy = new ArrayDeque<>();
+                // Walk the hierarchy up to but not including ImmutableObject (to ignore
+                // hashCode).
+                for (; clazz != ImmutableObject.class; clazz = clazz.getSuperclass()) {
+                  // Add to the front, so that shadowed fields show up later in the list.
+                  // This will mean that getFieldValues will show the most derived value.
+                  hierarchy.addFirst(clazz);
+                }
+                Map<String, Field> fields = new LinkedHashMap<>();
+                for (Class<?> hierarchyClass : hierarchy) {
+                  // Don't use hierarchyClass.getFields() because it only picks up public fields.
+                  for (Field field : hierarchyClass.getDeclaredFields()) {
+                    if (!Modifier.isStatic(field.getModifiers())) {
+                      field.setAccessible(true);
+                      fields.put(field.getName(), field);
                     }
                   }
-                  return ImmutableMap.copyOf(fields);
                 }
+                return ImmutableMap.copyOf(fields);
               });
 
   /** Lists all instance fields on an object, including non-public and inherited fields. */
   public static Map<String, Field> getAllFields(Class<?> clazz) {
-    return ALL_FIELDS_CACHE.getUnchecked(clazz);
+    return ALL_FIELDS_CACHE.get(clazz);
   }
 
   /** Return a string representing the persisted schema of a type or enum. */
diff --git a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java
index a740a2dc5..bafe6d7bf 100644
--- a/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java
+++ b/core/src/main/java/google/registry/model/common/DatabaseMigrationStateSchedule.java
@@ -18,14 +18,13 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryEnvironment;
+import google.registry.model.CacheUtils;
 import google.registry.model.annotations.DeleteAfterMigration;
 import google.registry.model.common.TimedTransitionProperty.TimedTransition;
 import google.registry.model.replay.SqlOnlyEntity;
@@ -135,18 +134,8 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton implements
           TimedTransitionProperty<MigrationState, MigrationStateTransition>>
       // Each instance should cache the migration schedule for five minutes before reloading
       CACHE =
-          CacheBuilder.newBuilder()
-              .expireAfterWrite(Duration.ofMinutes(5))
-              .build(
-                  new CacheLoader<
-                      Class<DatabaseMigrationStateSchedule>,
-                      TimedTransitionProperty<MigrationState, MigrationStateTransition>>() {
-                    @Override
-                    public TimedTransitionProperty<MigrationState, MigrationStateTransition> load(
-                        Class<DatabaseMigrationStateSchedule> unused) {
-                      return DatabaseMigrationStateSchedule.getUncached();
-                    }
-                  });
+          CacheUtils.newCacheBuilder(Duration.ofMinutes(5))
+              .build(singletonClazz -> DatabaseMigrationStateSchedule.getUncached());
 
   // Restrictions on the state transitions, e.g. no going from DATASTORE_ONLY to SQL_ONLY
   private static final ImmutableMultimap<MigrationState, MigrationState> VALID_STATE_TRANSITIONS =
@@ -235,7 +224,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton implements
 
   /** Loads the currently-set migration schedule from the cache, or the default if none exists. */
   public static TimedTransitionProperty<MigrationState, MigrationStateTransition> get() {
-    return CACHE.getUnchecked(DatabaseMigrationStateSchedule.class);
+    return CACHE.get(DatabaseMigrationStateSchedule.class);
   }
 
   /** Returns the database migration status at the given time. */
diff --git a/core/src/main/java/google/registry/model/server/ServerSecret.java b/core/src/main/java/google/registry/model/server/ServerSecret.java
index d073e42b4..91079967f 100644
--- a/core/src/main/java/google/registry/model/server/ServerSecret.java
+++ b/core/src/main/java/google/registry/model/server/ServerSecret.java
@@ -16,15 +16,14 @@ package google.registry.model.server;
 
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.primitives.Longs;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Ignore;
 import com.googlecode.objectify.annotation.OnLoad;
 import com.googlecode.objectify.annotation.Unindex;
+import google.registry.model.CacheUtils;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
 import google.registry.model.common.CrossTldSingleton;
@@ -32,7 +31,6 @@ import google.registry.model.replay.NonReplicatedEntity;
 import java.nio.ByteBuffer;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import javax.persistence.Column;
 import javax.persistence.PostLoad;
 import javax.persistence.Transient;
@@ -52,14 +50,7 @@ public class ServerSecret extends CrossTldSingleton implements NonReplicatedEnti
    * Supplier that can be reset for testing purposes.
    */
   private static final LoadingCache<Class<ServerSecret>, ServerSecret> CACHE =
-      CacheBuilder.newBuilder()
-          .build(
-              new CacheLoader<Class<ServerSecret>, ServerSecret>() {
-                @Override
-                public ServerSecret load(Class<ServerSecret> unused) {
-                  return retrieveAndSaveSecret();
-                }
-              });
+      CacheUtils.newCacheBuilder().build(singletonClazz -> retrieveAndSaveSecret());
 
   private static ServerSecret retrieveAndSaveSecret() {
     if (tm().isOfy()) {
@@ -84,11 +75,7 @@ public class ServerSecret extends CrossTldSingleton implements NonReplicatedEnti
 
   /** Returns the global ServerSecret instance, creating it if one isn't already in Datastore. */
   public static ServerSecret get() {
-    try {
-      return CACHE.get(ServerSecret.class);
-    } catch (ExecutionException e) {
-      throw new RuntimeException(e);
-    }
+    return CACHE.get(ServerSecret.class);
   }
 
   /** Most significant 8 bytes of the UUID value (stored separately for legacy purposes). */
diff --git a/networking/gradle/dependency-locks/compile.lockfile b/networking/gradle/dependency-locks/compile.lockfile
index 5b3083746..4d23ea923 100644
--- a/networking/gradle/dependency-locks/compile.lockfile
+++ b/networking/gradle/dependency-locks/compile.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -68,7 +69,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/networking/gradle/dependency-locks/compileClasspath.lockfile b/networking/gradle/dependency-locks/compileClasspath.lockfile
index 1e599d19b..e708f1e2d 100644
--- a/networking/gradle/dependency-locks/compileClasspath.lockfile
+++ b/networking/gradle/dependency-locks/compileClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -20,7 +21,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -66,7 +67,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
diff --git a/networking/gradle/dependency-locks/default.lockfile b/networking/gradle/dependency-locks/default.lockfile
index 52f10274a..81078a785 100644
--- a/networking/gradle/dependency-locks/default.lockfile
+++ b/networking/gradle/dependency-locks/default.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -70,7 +71,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/networking/gradle/dependency-locks/deploy_jar.lockfile b/networking/gradle/dependency-locks/deploy_jar.lockfile
index 52f10274a..81078a785 100644
--- a/networking/gradle/dependency-locks/deploy_jar.lockfile
+++ b/networking/gradle/dependency-locks/deploy_jar.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -70,7 +71,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/networking/gradle/dependency-locks/runtime.lockfile b/networking/gradle/dependency-locks/runtime.lockfile
index 52f10274a..81078a785 100644
--- a/networking/gradle/dependency-locks/runtime.lockfile
+++ b/networking/gradle/dependency-locks/runtime.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -70,7 +71,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/networking/gradle/dependency-locks/runtimeClasspath.lockfile b/networking/gradle/dependency-locks/runtimeClasspath.lockfile
index 52f10274a..81078a785 100644
--- a/networking/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/networking/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -70,7 +71,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/networking/gradle/dependency-locks/testCompile.lockfile b/networking/gradle/dependency-locks/testCompile.lockfile
index 18265f3de..fdb06678a 100644
--- a/networking/gradle/dependency-locks/testCompile.lockfile
+++ b/networking/gradle/dependency-locks/testCompile.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -77,7 +78,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/networking/gradle/dependency-locks/testCompileClasspath.lockfile b/networking/gradle/dependency-locks/testCompileClasspath.lockfile
index 61259d16a..bb939781f 100644
--- a/networking/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/networking/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -24,7 +25,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -75,7 +76,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.7.0
diff --git a/networking/gradle/dependency-locks/testRuntime.lockfile b/networking/gradle/dependency-locks/testRuntime.lockfile
index 8a0d8e58f..a62bc036d 100644
--- a/networking/gradle/dependency-locks/testRuntime.lockfile
+++ b/networking/gradle/dependency-locks/testRuntime.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -79,7 +80,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile b/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 8a0d8e58f..a62bc036d 100644
--- a/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/networking/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -79,7 +80,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/prober/gradle/dependency-locks/compile.lockfile b/prober/gradle/dependency-locks/compile.lockfile
index 691c4ad15..139e54e00 100644
--- a/prober/gradle/dependency-locks/compile.lockfile
+++ b/prober/gradle/dependency-locks/compile.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -71,7 +72,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/prober/gradle/dependency-locks/compileClasspath.lockfile b/prober/gradle/dependency-locks/compileClasspath.lockfile
index da2dfd9d0..2da903891 100644
--- a/prober/gradle/dependency-locks/compileClasspath.lockfile
+++ b/prober/gradle/dependency-locks/compileClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -20,7 +21,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -69,7 +70,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
diff --git a/prober/gradle/dependency-locks/default.lockfile b/prober/gradle/dependency-locks/default.lockfile
index 691c4ad15..139e54e00 100644
--- a/prober/gradle/dependency-locks/default.lockfile
+++ b/prober/gradle/dependency-locks/default.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -71,7 +72,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/prober/gradle/dependency-locks/deploy_jar.lockfile b/prober/gradle/dependency-locks/deploy_jar.lockfile
index 691c4ad15..139e54e00 100644
--- a/prober/gradle/dependency-locks/deploy_jar.lockfile
+++ b/prober/gradle/dependency-locks/deploy_jar.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -71,7 +72,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/prober/gradle/dependency-locks/runtime.lockfile b/prober/gradle/dependency-locks/runtime.lockfile
index 691c4ad15..139e54e00 100644
--- a/prober/gradle/dependency-locks/runtime.lockfile
+++ b/prober/gradle/dependency-locks/runtime.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -71,7 +72,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/prober/gradle/dependency-locks/runtimeClasspath.lockfile b/prober/gradle/dependency-locks/runtimeClasspath.lockfile
index 691c4ad15..139e54e00 100644
--- a/prober/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/prober/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -71,7 +72,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/prober/gradle/dependency-locks/testCompile.lockfile b/prober/gradle/dependency-locks/testCompile.lockfile
index fc89d368b..da77da04c 100644
--- a/prober/gradle/dependency-locks/testCompile.lockfile
+++ b/prober/gradle/dependency-locks/testCompile.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -83,7 +84,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/prober/gradle/dependency-locks/testCompileClasspath.lockfile b/prober/gradle/dependency-locks/testCompileClasspath.lockfile
index 0e7f19bba..df295eb55 100644
--- a/prober/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/prober/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -24,7 +25,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -81,7 +82,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.7.0
diff --git a/prober/gradle/dependency-locks/testRuntime.lockfile b/prober/gradle/dependency-locks/testRuntime.lockfile
index fc89d368b..da77da04c 100644
--- a/prober/gradle/dependency-locks/testRuntime.lockfile
+++ b/prober/gradle/dependency-locks/testRuntime.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -83,7 +84,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile
index fc89d368b..da77da04c 100644
--- a/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/prober/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -83,7 +84,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/proxy/gradle/dependency-locks/compile.lockfile b/proxy/gradle/dependency-locks/compile.lockfile
index 7bdbc2462..fff668d21 100644
--- a/proxy/gradle/dependency-locks/compile.lockfile
+++ b/proxy/gradle/dependency-locks/compile.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -31,7 +32,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -84,7 +85,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/proxy/gradle/dependency-locks/compileClasspath.lockfile b/proxy/gradle/dependency-locks/compileClasspath.lockfile
index ef89bd33a..8c3b761bb 100644
--- a/proxy/gradle/dependency-locks/compileClasspath.lockfile
+++ b/proxy/gradle/dependency-locks/compileClasspath.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -30,7 +31,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -82,7 +83,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
diff --git a/proxy/gradle/dependency-locks/default.lockfile b/proxy/gradle/dependency-locks/default.lockfile
index 7bdbc2462..fff668d21 100644
--- a/proxy/gradle/dependency-locks/default.lockfile
+++ b/proxy/gradle/dependency-locks/default.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -31,7 +32,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -84,7 +85,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/proxy/gradle/dependency-locks/deploy_jar.lockfile b/proxy/gradle/dependency-locks/deploy_jar.lockfile
index 7bdbc2462..fff668d21 100644
--- a/proxy/gradle/dependency-locks/deploy_jar.lockfile
+++ b/proxy/gradle/dependency-locks/deploy_jar.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -31,7 +32,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -84,7 +85,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/proxy/gradle/dependency-locks/runtime.lockfile b/proxy/gradle/dependency-locks/runtime.lockfile
index 7bdbc2462..fff668d21 100644
--- a/proxy/gradle/dependency-locks/runtime.lockfile
+++ b/proxy/gradle/dependency-locks/runtime.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -31,7 +32,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -84,7 +85,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/proxy/gradle/dependency-locks/runtimeClasspath.lockfile b/proxy/gradle/dependency-locks/runtimeClasspath.lockfile
index 7bdbc2462..fff668d21 100644
--- a/proxy/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/proxy/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -4,6 +4,7 @@
 com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -31,7 +32,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -84,7 +85,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/proxy/gradle/dependency-locks/testCompile.lockfile b/proxy/gradle/dependency-locks/testCompile.lockfile
index 38553005c..f276f48aa 100644
--- a/proxy/gradle/dependency-locks/testCompile.lockfile
+++ b/proxy/gradle/dependency-locks/testCompile.lockfile
@@ -5,6 +5,7 @@ com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -35,7 +36,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -96,7 +97,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
index ffd248f5f..24fd1037e 100644
--- a/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -5,6 +5,7 @@ com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -34,7 +35,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -94,7 +95,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
 org.junit.jupiter:junit-jupiter-api:5.7.0
diff --git a/proxy/gradle/dependency-locks/testRuntime.lockfile b/proxy/gradle/dependency-locks/testRuntime.lockfile
index 38553005c..f276f48aa 100644
--- a/proxy/gradle/dependency-locks/testRuntime.lockfile
+++ b/proxy/gradle/dependency-locks/testRuntime.lockfile
@@ -5,6 +5,7 @@ com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -35,7 +36,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -96,7 +97,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 38553005c..f276f48aa 100644
--- a/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -5,6 +5,7 @@ com.beust:jcommander:1.60
 com.fasterxml.jackson.core:jackson-annotations:2.12.1
 com.fasterxml.jackson.core:jackson-core:2.12.1
 com.fasterxml.jackson:jackson-bom:2.12.1
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -35,7 +36,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -96,7 +97,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:1.3
diff --git a/util/gradle/dependency-locks/compile.lockfile b/util/gradle/dependency-locks/compile.lockfile
index 52598185b..569763fab 100644
--- a/util/gradle/dependency-locks/compile.lockfile
+++ b/util/gradle/dependency-locks/compile.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -20,7 +21,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -60,7 +61,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/util/gradle/dependency-locks/compileClasspath.lockfile b/util/gradle/dependency-locks/compileClasspath.lockfile
index c0b61d2b9..64c0a5f30 100644
--- a/util/gradle/dependency-locks/compileClasspath.lockfile
+++ b/util/gradle/dependency-locks/compileClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
 com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.89.2
@@ -19,7 +20,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -58,7 +59,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
 org.yaml:snakeyaml:1.17
diff --git a/util/gradle/dependency-locks/default.lockfile b/util/gradle/dependency-locks/default.lockfile
index 2b843948b..5cd786bc6 100644
--- a/util/gradle/dependency-locks/default.lockfile
+++ b/util/gradle/dependency-locks/default.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -61,7 +62,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/util/gradle/dependency-locks/deploy_jar.lockfile b/util/gradle/dependency-locks/deploy_jar.lockfile
index 2b843948b..5cd786bc6 100644
--- a/util/gradle/dependency-locks/deploy_jar.lockfile
+++ b/util/gradle/dependency-locks/deploy_jar.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -61,7 +62,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/util/gradle/dependency-locks/runtime.lockfile b/util/gradle/dependency-locks/runtime.lockfile
index 2b843948b..5cd786bc6 100644
--- a/util/gradle/dependency-locks/runtime.lockfile
+++ b/util/gradle/dependency-locks/runtime.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -61,7 +62,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/util/gradle/dependency-locks/runtimeClasspath.lockfile b/util/gradle/dependency-locks/runtimeClasspath.lockfile
index 2b843948b..5cd786bc6 100644
--- a/util/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/util/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,6 +1,7 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:1.31.3
 com.google.api.grpc:proto-google-cloud-tasks-v2:1.33.2
@@ -21,7 +22,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:30.1.1-jre
@@ -61,7 +62,7 @@ org.apache.httpcomponents:httpcore:4.4.14
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.8.0
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.threeten:threetenbp:1.5.1
diff --git a/util/gradle/dependency-locks/testCompile.lockfile b/util/gradle/dependency-locks/testCompile.lockfile
index 22ead4133..3dd590cbf 100644
--- a/util/gradle/dependency-locks/testCompile.lockfile
+++ b/util/gradle/dependency-locks/testCompile.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -25,7 +26,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1.1-jre
@@ -73,7 +74,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:2.2
diff --git a/util/gradle/dependency-locks/testCompileClasspath.lockfile b/util/gradle/dependency-locks/testCompileClasspath.lockfile
index e16bfea68..4765f0e5b 100644
--- a/util/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/util/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -24,7 +25,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava-testlib:30.1.1-jre
@@ -71,7 +72,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:2.2
 org.hamcrest:hamcrest:2.2
diff --git a/util/gradle/dependency-locks/testRuntime.lockfile b/util/gradle/dependency-locks/testRuntime.lockfile
index 0f48dbc40..6890862d8 100644
--- a/util/gradle/dependency-locks/testRuntime.lockfile
+++ b/util/gradle/dependency-locks/testRuntime.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -26,7 +27,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -75,7 +76,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:2.2
diff --git a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 0f48dbc40..6890862d8 100644
--- a/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -2,6 +2,7 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.fasterxml.jackson.core:jackson-annotations:2.10.3
+com.github.ben-manes.caffeine:caffeine:2.9.3
 com.github.docker-java:docker-java-api:3.2.7
 com.github.docker-java:docker-java-transport-zerodep:3.2.7
 com.github.docker-java:docker-java-transport:3.2.7
@@ -26,7 +27,7 @@ com.google.cloud:google-cloud-tasks:1.33.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.7
 com.google.dagger:dagger:2.33
-com.google.errorprone:error_prone_annotations:2.7.1
+com.google.errorprone:error_prone_annotations:2.10.0
 com.google.flogger:flogger-system-backend:0.7.4
 com.google.flogger:flogger:0.7.4
 com.google.guava:failureaccess:1.0.1
@@ -75,7 +76,7 @@ org.apiguardian:apiguardian-api:1.1.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-compat-qual:2.5.5
-org.checkerframework:checker-qual:3.9.1
+org.checkerframework:checker-qual:3.19.0
 org.codehaus.mojo:animal-sniffer-annotations:1.20
 org.conscrypt:conscrypt-openjdk-uber:2.5.1
 org.hamcrest:hamcrest-core:2.2