Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Adapt to new ProjectCache interface

Depends-On: https://gerrit-review.googlesource.com/c/gerrit/+/324619
Change-Id: I0bb21fd8c29337b53643fd31959ec891ded23d2e
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/DeleteRemote.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/DeleteRemote.java
index 408b092..1a25401 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/DeleteRemote.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/DeleteRemote.java
@@ -61,7 +61,7 @@
       wh.commit(md);
     }
 
-    projectCache.evict(rsrc.getProject());
+    projectCache.evictAndReindex(rsrc.getProject());
 
     return Response.none();
   }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/UpsertRemote.java b/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/UpsertRemote.java
index 56d2836..089d4e6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/UpsertRemote.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/UpsertRemote.java
@@ -129,7 +129,7 @@
       wh.commit(md);
     }
 
-    projectCache.evict(project);
+    projectCache.evictAndReindex(project);
 
     Config cfg = configFactory.getProjectPluginConfigWithInheritance(project, pluginName);
     RemoteConfig rc = remoteConfigFactory.create(cfg, remoteName);