diff --git a/modules/graphql_compose_edges/src/EntityConnection.php b/modules/graphql_compose_edges/src/EntityConnection.php
index 4c5af000eafc754338e6c9ad606b0fc4a3e3eb95..2053704c390a0cfe12df25c69206c5b47b5885cb 100644
--- a/modules/graphql_compose_edges/src/EntityConnection.php
+++ b/modules/graphql_compose_edges/src/EntityConnection.php
@@ -327,7 +327,9 @@ class EntityConnection implements ConnectionInterface {
     $result = $query->execute();
 
     // Add entity type tag to cache metadata.
-    $this->context->addCacheTags($this->queryHelper->getEntityType()->getListCacheTags());
+    $entity_type = $this->queryHelper->getEntityType();
+    $this->context->addCacheTags($entity_type->getListCacheTags());
+    $this->context->addCacheContexts($entity_type->getListCacheContexts());
 
     return $this->queryHelper->getLoaderPromise($result);
   }