diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index f89d149..cd666c7 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1459,7 +1459,7 @@ function comment_load_multiple(array $cids = NULL, $reset = FALSE) {
  *   The comment object.
  */
 function comment_load($cid, $reset = FALSE) {
-  return entity_load('comment', $cid);
+  return entity_load('comment', $cid, $reset);
 }
 
 /**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
index e0bbfd9..84f7909 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
@@ -28,7 +28,6 @@
  *   base_table = "comment",
  *   uri_callback = "comment_uri",
  *   fieldable = TRUE,
- *   static_cache = FALSE,
  *   entity_keys = {
  *     "id" = "cid",
  *     "bundle" = "node_type",
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
index 1070107..89b6060 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
@@ -69,7 +69,7 @@ function testCommentInterface() {
     // Test changing the comment author to "Anonymous".
     $this->drupalGet('comment/' . $comment->id . '/edit');
     $comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => ''));
-    $comment_loaded = comment_load($comment->id);
+    $comment_loaded = comment_load($comment->id, TRUE);
     $this->assertTrue(empty($comment_loaded->name) && $comment_loaded->uid == 0, 'Comment author successfully changed to anonymous.');
 
     // Test changing the comment author to an unverified user.
@@ -82,7 +82,7 @@ function testCommentInterface() {
     // Test changing the comment author to a verified user.
     $this->drupalGet('comment/' . $comment->id . '/edit');
     $comment = $this->postComment(NULL, $comment->comment, $comment->subject, array('name' => $this->web_user->name));
-    $comment_loaded = comment_load($comment->id);
+    $comment_loaded = comment_load($comment->id, TRUE);
     $this->assertTrue($comment_loaded->name == $this->web_user->name && $comment_loaded->uid == $this->web_user->uid, 'Comment author successfully changed to a registered user.');
 
     $this->drupalLogout();
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index e9f3f6c..070fa82 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -327,7 +327,7 @@ function testUserDelete() {
     $this->assertFalse(node_load($node->nid, TRUE), 'Node of the user has been deleted.');
     $this->assertFalse(node_revision_load($revision), 'Node revision of the user has been deleted.');
     $this->assertTrue(node_load($revision_node->nid, TRUE), "Current revision of the user's node was not deleted.");
-    $this->assertFalse(comment_load($comment->cid), 'Comment of the user has been deleted.');
+    $this->assertFalse(comment_load($comment->cid, TRUE), 'Comment of the user has been deleted.');
 
     // Confirm that user is logged out.
     $this->assertNoText($account->name, 'Logged out.');