diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 65ce8d5..af9dd6d 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -163,7 +163,7 @@ function entity_get_view_modes($entity_type = NULL) {
 function entity_load($entity_type, $id, $reset = FALSE) {
   $controller = Drupal::entityManager()->getStorageController($entity_type);
   if ($reset) {
-    $controller->resetCache();
+    $controller->resetCache(array($id));
   }
   return $controller->load($id);
 }
@@ -275,7 +275,7 @@ function entity_load_by_uuid($entity_type, $uuid, $reset = FALSE) {
 function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
   $controller = Drupal::entityManager()->getStorageController($entity_type);
   if ($reset) {
-    $controller->resetCache();
+    $controller->resetCache($ids);
   }
   return $controller->loadMultiple($ids);
 }
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index cd31e87..2b623af 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -141,7 +141,7 @@ public function loadMultiple(array $ids = NULL) {
   }
 
   /**
-   * Implements Drupal\Core\Entity\EntityStorageControllerInterface::load().
+   * {@inheritdoc}
    */
   public function load($id) {
     $entities = $this->loadMultiple(array($id));
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 867354d..9161dce 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -178,7 +178,7 @@ public function loadMultiple(array $ids = NULL) {
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityStorageControllerInterface::load().
+   * {@inheritdoc}
    */
   public function load($id) {
     $entities = $this->loadMultiple(array($id));
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
index d23a422..5ce211f 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
@@ -46,7 +46,7 @@ public function loadMultiple(array $ids = NULL);
    * @param mixed $id
    *   The ID of the entity to load.
    *
-   * @return
+   * @return \Drupal\Core\Entity\EntityInterface
    *   An entity object.
    */
   public function load($id);