Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Adapt to new ProjectCache interface

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

src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
index b756364..4716c5b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/deleteproject/HideProject.java
@@ -72,7 +72,7 @@
 
       md.setMessage("Hide project\n");
       projectConfig.commit(md);
-      projectCache.evict(projectConfig.getProject());
+      projectCache.evictAndReindex(projectConfig.getProject());
     } catch (RepositoryNotFoundException e) {
       throw new ResourceNotFoundException(rsrc.getNameKey().get(), e);
     } catch (ConfigInvalidException e) {