diff --git a/modules/ctools_block/src/Plugin/Block/EntityField.php b/modules/ctools_block/src/Plugin/Block/EntityField.php
index bef6c8f..1356cd2 100644
--- a/modules/ctools_block/src/Plugin/Block/EntityField.php
+++ b/modules/ctools_block/src/Plugin/Block/EntityField.php
@@ -155,6 +155,7 @@ class EntityField extends BlockBase implements ContextAwarePluginInterface, Cont
     }
 
     CacheableMetadata::createFromObject($entity)
+      ->addCacheableDependency($this->getContext('entity'))
       ->applyTo($build);
 
     return $build;
diff --git a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
index 063ba3f..73e3a59 100644
--- a/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
+++ b/modules/ctools_block/src/Tests/EntityFieldBlockTest.php
@@ -93,6 +93,7 @@ class EntityFieldBlockTest extends WebTestBase {
     $this->drupalGet('node/' . $a->id());
     $this->assertText($a->body->value);
     $this->drupalGet('node/' . $b->id());
+    $this->assertNoText($a->body->value);
     $this->assertText($b->body->value);
 
     $text = 'This is my text. Are you not entertained?';