reverted:
--- b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -408,11 +408,6 @@
 
     unset($entity->original);
 
-    if (!$is_new) {
-      // Reset the static cache when updating an entity.
-      $this->resetCache(array($id));
-    }
-
     return $return;
   }
 
reverted:
--- b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -93,20 +93,17 @@
 
     $role_storage = $this->getMockBuilder('Drupal\user\RoleStorage')
       ->disableOriginalConstructor()
+      ->setMethods(array('loadMultiple'))
-      ->setMethods(array('isPermissionInRoles'))
       ->getMock();
     $role_storage->expects($this->any())
+      ->method('loadMultiple')
+      ->will($this->returnValueMap(array(
+        array(array(), array()),
+        array(NULL, $roles),
+        array(array('role_one'), array($roles['role_one'])),
+        array(array('role_two'), array($roles['role_two'])),
+        array(array('role_one', 'role_two'), array($roles['role_one'], $roles['role_two'])),
+      )));
-      ->method('isPermissionInRoles')
-      ->will($this->returnCallback(function ($permission, $rids) use ($roles) {
-        $result = FALSE;
-        foreach ($rids as $rid) {
-          if ($roles[$rid]->hasPermission($permission)) {
-            $result = TRUE;
-            break;
-          }
-        }
-        return $result;
-      }));
 
     $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $entity_manager->expects($this->any())