diff --git a/src/Plugin/Block/AddToAnyBlock.php b/src/Plugin/Block/AddToAnyBlock.php
index 39db5a7eb0900c4e3e5101952791c7cd5ff535b3..41b07c92401837858fe2a096e0d46e28910958f2 100644
--- a/src/Plugin/Block/AddToAnyBlock.php
+++ b/src/Plugin/Block/AddToAnyBlock.php
@@ -21,11 +21,11 @@ class AddToAnyBlock extends BlockBase {
     $node = \Drupal::routeMatch()->getParameter('node');
 
     return array(
-      // Not using #markup because data attribute name gets mangled
-      // @see https://www.drupal.org/node/2609928
-      // '#markup' => addtoany_create_node_buttons($node),
       '#addtoany_html' => addtoany_create_node_buttons($node),
       '#theme' => 'addtoany_standard',
+      '#cache' => array(
+        'contexts' => array('url'),
+      ),
     );
   }
 
diff --git a/src/Plugin/DsField/AddToAnyField.php b/src/Plugin/DsField/AddToAnyField.php
index 8a25f7fc0f275e164628366c1836ed1b63d4963a..251709e71206fdc40076c6a589d1887b1ab2b2a5 100644
--- a/src/Plugin/DsField/AddToAnyField.php
+++ b/src/Plugin/DsField/AddToAnyField.php
@@ -28,8 +28,11 @@ class AddToAnyField extends DsFieldBase {
     $node = \Drupal::routeMatch()->getParameter('node');
 
     return array(
-      '#theme' => 'addtoany_standard',
       '#addtoany_html' => addtoany_create_node_buttons($node),
+      '#theme' => 'addtoany_standard',
+      '#cache' => array(
+        'contexts' => array('url'),
+      ),
     );
   }
 }