diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java
index 38ad2aeb1c..2515401877 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java
@@ -36,6 +36,7 @@ public class GroupDetailFactory implements Callable<GroupDetail> {
   private final ReviewDb db;
   private final GroupControl.Factory groupControl;
   private final Groups groups;
+  private final GroupIncludeCache groupIncludeCache;
 
   private final AccountGroup.UUID groupUuid;
   private GroupControl control;
@@ -45,10 +46,12 @@ public class GroupDetailFactory implements Callable<GroupDetail> {
       ReviewDb db,
       GroupControl.Factory groupControl,
       Groups groups,
+      GroupIncludeCache groupIncludeCache,
       @Assisted AccountGroup.UUID groupUuid) {
     this.db = db;
     this.groupControl = groupControl;
     this.groups = groups;
+    this.groupIncludeCache = groupIncludeCache;
 
     this.groupUuid = groupUuid;
   }
@@ -65,11 +68,11 @@ public class GroupDetailFactory implements Callable<GroupDetail> {
     return groups.getMembers(db, groupUuid).filter(control::canSeeMember).collect(toImmutableSet());
   }
 
-  private ImmutableSet<AccountGroup.UUID> loadIncludes() throws OrmException {
+  private ImmutableSet<AccountGroup.UUID> loadIncludes() {
     if (!control.canSeeGroup()) {
       return ImmutableSet.of();
     }
 
-    return groups.getIncludes(db, groupUuid).collect(toImmutableSet());
+    return ImmutableSet.copyOf(groupIncludeCache.subgroupsOf(groupUuid));
   }
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
index eb42bc6446..9004a8ade9 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java
@@ -15,21 +15,19 @@
 package com.google.gerrit.server.group;
 
 import static com.google.common.base.Strings.nullToEmpty;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 
-import com.google.common.collect.ImmutableList;
 import com.google.gerrit.common.errors.NoSuchGroupException;
 import com.google.gerrit.extensions.common.GroupInfo;
 import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
 import com.google.gerrit.extensions.restapi.RestReadView;
 import com.google.gerrit.reviewdb.client.AccountGroup;
-import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.account.GroupControl;
+import com.google.gerrit.server.account.GroupIncludeCache;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -40,19 +38,14 @@ public class ListIncludedGroups implements RestReadView<GroupResource> {
   private static final Logger log = org.slf4j.LoggerFactory.getLogger(ListIncludedGroups.class);
 
   private final GroupControl.Factory controlFactory;
-  private final Provider<ReviewDb> dbProvider;
-  private final Groups groups;
+  private final GroupIncludeCache groupIncludeCache;
   private final GroupJson json;
 
   @Inject
   ListIncludedGroups(
-      GroupControl.Factory controlFactory,
-      Provider<ReviewDb> dbProvider,
-      Groups groups,
-      GroupJson json) {
+      GroupControl.Factory controlFactory, GroupIncludeCache groupIncludeCache, GroupJson json) {
     this.controlFactory = controlFactory;
-    this.dbProvider = dbProvider;
-    this.groups = groups;
+    this.groupIncludeCache = groupIncludeCache;
     this.json = json;
   }
 
@@ -64,10 +57,8 @@ public class ListIncludedGroups implements RestReadView<GroupResource> {
 
     boolean ownerOfParent = rsrc.getControl().isOwner();
     List<GroupInfo> included = new ArrayList<>();
-    ImmutableList<AccountGroup.UUID> includedGroupUuids =
-        groups
-            .getIncludes(dbProvider.get(), rsrc.toAccountGroup().getGroupUUID())
-            .collect(toImmutableList());
+    Collection<AccountGroup.UUID> includedGroupUuids =
+        groupIncludeCache.subgroupsOf(rsrc.toAccountGroup().getGroupUUID());
     for (AccountGroup.UUID includedGroupUuid : includedGroupUuids) {
       try {
         GroupControl i = controlFactory.controlFor(includedGroupUuid);