Merge pull request #446 from Gizra/avoid-double-caching

Avoid double caching of OgMembership entities.

Author: amitaibu

src/MembershipManager.php

@@ -97,25 +97,20 @@ public function getMemberships(AccountInterface $user, array $states = [OgMember
     ];
     $identifier = implode(':', $identifier);
 
-    // Return cached result if it exists.
-    if (isset($this->cache[$identifier])) {
-      return $this->cache[$identifier];
-    }
-
-    $query = $this->entityTypeManager
-      ->getStorage('og_membership')
-      ->getQuery()
-      ->condition('uid', $user->id())
-      ->condition('state', $states, 'IN');
+    // Use cached result if it exists.
+    if (!isset($this->cache[$identifier])) {
+      $query = $this->entityTypeManager
+        ->getStorage('og_membership')
+        ->getQuery()
+        ->condition('uid', $user->id())
+        ->condition('state', $states, 'IN');
 
-    $results = $query->execute();
+      $this->cache[$identifier] = $query->execute();
+    }
 
-    /** @var \Drupal\og\Entity\OgMembership[] $memberships */
-    $this->cache[$identifier] = $this->entityTypeManager
+    return $this->entityTypeManager
       ->getStorage('og_membership')
-      ->loadMultiple($results);
-
-    return $this->cache[$identifier];
+      ->loadMultiple($this->cache[$identifier]);
   }
 
   /**