diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index c698723bebc..069a7c161bc 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -530,12 +530,21 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			$uid = $userDN;
 		}
 
-		if($primaryGroup !== false) {
-			$groups[] = $primaryGroup;
-		}
+                if(isset($this->cachedGroupsByMember[$uid])) {
+                        $groups[] = $this->cachedGroupsByMember[$uid];
+                } else {
+                        $groupsByMember = array_values($this->getGroupsByMember($uid));
+                        $groupsByMember = $this->access->ownCloudGroupNames($groupsByMember);
+                        $this->cachedGroupsByMember[$uid] = $groupsByMember;
+                        $groups = array_merge($groups, $groupsByMember);
+                }
 
-		$groups = array_unique($groups, SORT_LOCALE_STRING);
-		$this->access->connection->writeToCache($cacheKey, $groups);
+                if($primaryGroup !== false) {
+                        $groups[] = $primaryGroup;
+                }
+
+                $groups = array_unique($groups, SORT_LOCALE_STRING);
+                $this->access->connection->writeToCache($cacheKey, $groups);
 
 		return $groups;
 	}