Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Adapt to new ProjectCache interface

Change-Id: I10fb30da6dbe83b05cbaef1675ec28de93c5591b
Depends-on: https://gerrit-review.googlesource.com/c/gerrit/+/324315

src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/DeleteRemote.java

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();
   }

src/main/java/com/googlesource/gerrit/plugins/webhooks/rest/UpsertRemote.java

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);