diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 037731d169..81a3f732a6 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -3609,6 +3609,10 @@ default behavior.
 
 [[receive.enableProtocolV2]]receive.enableProtocolV2::
 +
+[NOTE]
+Support for Git protocol version 2 is still experimental. Do not use it in
+production!
++
 Enable support for git protocol version 2.
 +
 When this option is enabled, clients may send upload pack using git
diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
index ecb9b2d771..923138211a 100644
--- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java
+++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
@@ -346,12 +346,8 @@ public class GroupsUpdate {
 
   private void updateCachesOnGroupCreation(InternalGroup createdGroup) throws IOException {
     indexer.get().index(createdGroup.getGroupUUID());
-    for (Account.Id modifiedMember : createdGroup.getMembers()) {
-      groupIncludeCache.evictGroupsWithMember(modifiedMember);
-    }
-    for (AccountGroup.UUID modifiedSubgroup : createdGroup.getSubgroups()) {
-      groupIncludeCache.evictParentGroupsOf(modifiedSubgroup);
-    }
+    createdGroup.getMembers().forEach(groupIncludeCache::evictGroupsWithMember);
+    createdGroup.getSubgroups().forEach(groupIncludeCache::evictParentGroupsOf);
   }
 
   private void updateCachesOnGroupUpdate(UpdateResult result) throws IOException {