diff --git a/WORKSPACE b/WORKSPACE
index 68aaea5..5e4b7ea 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,7 +8,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6ebb3cfa1332a0dc0d2b7ea904a4703656f2ba54",
+    commit = "a52e3f381e2fe2a53f7641150ff723171a2dda1e",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/package.json b/package.json
index fac70e5..b68f019 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "task",
-  "version": "3.2.6-SNAPSHOT",
+  "version": "3.5.0-SNAPSHOT",
   "description": "Task Plugin",
   "dependencies": {
     "@bazel/rollup": "^3.4.0",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java
index 4c3748d..23644d1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java
@@ -16,6 +16,7 @@
 
 import com.google.gerrit.exceptions.StorageException;
 import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.index.FieldDef;
 import com.google.gerrit.index.query.AndPredicate;
 import com.google.gerrit.index.query.NotPredicate;
 import com.google.gerrit.index.query.OrPredicate;
@@ -23,11 +24,11 @@
 import com.google.gerrit.index.query.QueryParseException;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.config.GerritServerConfig;
+import com.google.gerrit.server.index.change.ChangeField;
 import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.query.change.ChangeIndexPredicate;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.gerrit.server.query.change.DestinationPredicate;
-import com.google.gerrit.server.query.change.ProjectPredicate;
-import com.google.gerrit.server.query.change.RefPredicate;
 import com.google.gerrit.server.query.change.RegexProjectPredicate;
 import com.google.gerrit.server.query.change.RegexRefPredicate;
 import com.google.inject.Inject;
@@ -130,12 +131,16 @@
       return true;
     }
     if (predicate instanceof DestinationPredicate
-        || predicate instanceof ProjectPredicate
-        || predicate instanceof RefPredicate
         || predicate instanceof RegexProjectPredicate
         || predicate instanceof RegexRefPredicate) {
       return true;
     }
+    if (predicate instanceof ChangeIndexPredicate) {
+      FieldDef<ChangeData, ?> field = ((ChangeIndexPredicate) predicate).getField();
+      if (field.equals(ChangeField.PROJECT) || field.equals(ChangeField.REF)) {
+        return true;
+      }
+    }
     return cacheableByBranchPredicateClassNames.contains(predicate.getClass().getName());
   }
 }
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile
index 12aa74a..35e39f2 100755
--- a/test/docker/gerrit/Dockerfile
+++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.4.0-ubuntu20
+FROM gerritcodereview/gerrit:3.5.0.1-ubuntu20
 
 ENV GERRIT_SITE /var/gerrit
 RUN git config -f "$GERRIT_SITE/etc/gerrit.config" auth.type \