diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index ad82046..f2fb609 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -309,7 +309,14 @@ function comment_form_field_storage_config_edit_form_alter(&$form, FormStateInte
  *
  * @see \Drupal\comment\Plugin\Field\FieldType\CommentItem::propertyDefinitions()
  */
-function comment_entity_storage_load($entities, $entity_type) {
+function comment_entity_prepare_view($entity_type, array $entities, array $displays, $view_mode) {
+  comment_statistics_prepare($entity_type, $entities);
+}
+
+/**
+ * Set comment statistics onto entities.
+ */
+function comment_statistics_prepare($entity_type, array $entities) {
   // Comments can only be attached to content entities, so skip others.
   if (!\Drupal::entityManager()->getDefinition($entity_type)->isSubclassOf('Drupal\Core\Entity\FieldableEntityInterface')) {
     return;
diff --git a/core/modules/comment/src/CommentLinkBuilder.php b/core/modules/comment/src/CommentLinkBuilder.php
index 951a69f..06fe073 100644
--- a/core/modules/comment/src/CommentLinkBuilder.php
+++ b/core/modules/comment/src/CommentLinkBuilder.php
@@ -78,6 +78,8 @@ public function buildCommentedEntityLinks(FieldableEntityInterface $entity, arra
       return array();
     }
 
+    comment_statistics_prepare($entity->getEntityTypeId(), [$entity->id() => $entity]);
+
     $fields = $this->commentManager->getFields($entity->getEntityTypeId());
     foreach ($fields as $field_name => $detail) {
       // Skip fields that the entity does not have.
diff --git a/core/modules/comment/src/CommentStatistics.php b/core/modules/comment/src/CommentStatistics.php
index c37641c..c2c7438 100644
--- a/core/modules/comment/src/CommentStatistics.php
+++ b/core/modules/comment/src/CommentStatistics.php
@@ -7,6 +7,7 @@
 namespace Drupal\comment;
 
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\EntityChangedInterface;
@@ -256,10 +257,7 @@ public function update(CommentInterface $comment) {
         ->condition('field_name', $comment->getFieldName())
         ->execute();
     }
-
-    // Reset the cache of the commented entity so that when the entity is loaded
-    // the next time, the statistics will be loaded again.
-    $this->entityManager->getStorage($comment->getCommentedEntityTypeId())->resetCache(array($comment->getCommentedEntityId()));
+    Cache::invalidateTags(Cache::mergeTags($comment->getCommentedEntity()->getCacheTags(), $comment->getCommentedEntity()->getEntityType()->getListCacheTags()));
   }
 
 }
diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index fbca55b..c986857 100644
--- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -143,6 +143,7 @@ public function viewElements(FieldItemListInterface $items) {
 
     $field_name = $this->fieldDefinition->getName();
     $entity = $items->getEntity();
+    comment_statistics_prepare($entity->getEntityTypeId(), [$entity->id() => $entity]);
 
     $status = $items->status;
 
