diff -u b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php --- b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php /** * {@inheritdoc} */ @@ -127,11 +127,15 @@ + if (!$revision) { + if ($revision = $this->getRevisionFromPersistentCache($revision_id)) { + $this->setStaticEntityRevisionCache($revision_id, $revision); ++ if ($revision->isDefaultRevision()) { ++ $this->setStaticCache([$revision->id() => $revision]); ++ } + } + else { + if ($revision = $this->doLoadRevision($revision_id)) { + $this->setStaticEntityRevisionCache($revision_id, $revision); + if ($revision->isDefaultRevision()) { ++ $this->setStaticCache([$revision->id() => $revision]); + $this->setPersistentCache([$revision->id() => $revision]); + } + } @@ -313,7 +317,6 @@ + // else. + if (($revision = $this->getFromStaticEntityRevisionCache($revision_id)) && $revision->isDefaultRevision()) { + $this->resetCache([$revision->id()]); -+ $this->resetRevisionCache([$revision_id]); + } + else { + $this->resetRevisionCache([$revision_id]);