diff --git a/includes/common.inc b/includes/common.inc
index 34fa9b9..05912c6 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7942,7 +7942,10 @@ function entity_create_stub_entity($entity_type, $ids) {
  *   fields must have. Instead, it is preferable to use EntityFieldQuery to
  *   retrieve a list of entity IDs loadable by this function.
  * @param $reset
- *   Whether to reset the internal cache for the requested entity type.
+ *   Whether to reset the load cache for the requested entity type.
+ *   Do not use $reset if it is sufficient to flush individual entities
+ *   from the cache using:
+ *   entity_get_controller($entity_type)->resetCache(array($entity_id));
  *
  * @return
  *   An array of entity objects indexed by their ids. When no results are
diff --git a/includes/form.inc b/includes/form.inc
index f1691ad..6c4f364 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -4470,11 +4470,12 @@ function element_validate_number($element, &$form_state) {
  *     ->range(0, $limit)
  *     ->execute();
  *   foreach ($result as $row) {
- *     $node = node_load($row->nid, NULL, TRUE);
+ *     $node = node_load($row->nid);
  *     $context['results'][] = $node->nid . ' : ' . check_plain($node->title);
  *     $context['sandbox']['progress']++;
  *     $context['sandbox']['current_node'] = $node->nid;
  *     $context['message'] = check_plain($node->title);
+ *     entity_get_controller('node')->resetCache(array($node->nid));
  *   }
  *   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
  *     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 6f0df6c..5d6f643 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1657,8 +1657,11 @@ function comment_delete_multiple($cids) {
  *   EntityFieldQuery to retrieve a list of entity IDs loadable by
  *   this function.
  * @param $reset
- *   Whether to reset the internal static entity cache. Note that the static
+ *   Whether to reset the entity load cache for comments. Note that the
  *   cache is disabled in comment_entity_info() by default.
+ *   Do not use $reset if it is sufficient to flush individual comments
+ *   from the cache using:
+ *   entity_get_controller('comment')->resetCache(array($cid));
  *
  * @return
  *   An array of comment objects, indexed by comment ID.
@@ -1678,8 +1681,11 @@ function comment_load_multiple($cids = array(), $conditions = array(), $reset =
  * @param $cid
  *   The identifying comment id.
  * @param $reset
- *   Whether to reset the internal static entity cache. Note that the static
+ *   Whether to reset the entity load cache for comments. Note that the
  *   cache is disabled in comment_entity_info() by default.
+ *   Do not use $reset if it is sufficient to flush individual comments
+ *   from the cache using:
+ *   entity_get_controller('comment')->resetCache(array($cid));
  *
  * @return
  *   The comment object.
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index 145be7a..9a2df97 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -318,13 +318,14 @@ function node_mass_update($nodes, $updates) {
  * @see node_mass_update()
  */
 function _node_mass_update_helper($nid, $updates) {
-  $node = node_load($nid, NULL, TRUE);
+  $node = node_load($nid);
   // For efficiency manually save the original node before applying any changes.
   $node->original = clone $node;
   foreach ($updates as $name => $value) {
     $node->$name = $value;
   }
   node_save($node);
+  entity_get_controller('node')->resetCache(array($nid));
   return $node;
 }
 
diff --git a/modules/node/node.module b/modules/node/node.module
index f892d1c..a5b8bc6 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -936,7 +936,10 @@ function node_invoke($node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
  *   EntityFieldQuery to retrieve a list of entity IDs loadable by
  *   this function.
  * @param $reset
- *   Whether to reset the internal node_load cache.
+ *   Whether to reset the entity load cache for nodes.
+ *   Do not use $reset if it is sufficient to flush individual nodes
+ *   from the cache using:
+ *   entity_get_controller('node')->resetCache(array($nid));
  *
  * @return
  *   An array of node objects indexed by nid.
@@ -955,7 +958,10 @@ function node_load_multiple($nids = array(), $conditions = array(), $reset = FAL
  * @param $vid
  *   The revision ID.
  * @param $reset
- *   Whether to reset the node_load_multiple cache.
+ *   Whether to reset the entity load cache for nodes.
+ *   Do not use $reset if it is sufficient to flush individual nodes
+ *   from the cache using:
+ *   entity_get_controller('node')->resetCache(array($nid));
  *
  * @return
  *   A fully-populated node object, or FALSE if the node is not found.
@@ -3638,12 +3644,13 @@ function node_access_rebuild($batch_mode = FALSE) {
       // Rebuild newest nodes first so that recent content becomes available quickly.
       $nids = db_query("SELECT nid FROM {node} ORDER BY nid DESC")->fetchCol();
       foreach ($nids as $nid) {
-        $node = node_load($nid, NULL, TRUE);
+        $node = node_load($nid);
         // To preserve database integrity, only acquire grants if the node
         // loads successfully.
         if (!empty($node)) {
           node_access_acquire_grants($node);
         }
+        entity_get_controller('node')->resetCache(array($nid));
       }
     }
   }
diff --git a/modules/user/user.module b/modules/user/user.module
index afb4119..f6f4b98 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -273,8 +273,10 @@ function user_external_load($authname) {
  *   EntityFieldQuery to retrieve a list of entity IDs loadable by
  *   this function.
  * @param $reset
- *   A boolean indicating that the internal cache should be reset. Use this if
- *   loading a user object which has been altered during the page request.
+ *   Whether to reset the entity load cache for users.
+ *   Do not use $reset if it is sufficient to flush individual users
+ *   from the cache using:
+ *   entity_get_controller('user')->resetCache(array($uid));
  *
  * @return
  *   An array of user objects, indexed by uid.
@@ -353,8 +355,10 @@ class UserController extends DrupalDefaultEntityController {
  * @param $uid
  *   Integer specifying the user ID to load.
  * @param $reset
- *   TRUE to reset the internal cache and load from the database; FALSE
- *   (default) to load from the internal cache, if set.
+ *   Whether to reset the entity load cache for users.
+ *   Do not use $reset if it is sufficient to flush individual users
+ *   from the cache using:
+ *   entity_get_controller('user')->resetCache(array($uid));
  *
  * @return
  *   A fully-loaded user object upon successful user load, or FALSE if the user