diff --git a/src/Tests/TokenTestTrait.php b/src/Tests/TokenTestTrait.php
index c40326d..e621c93 100644
--- a/src/Tests/TokenTestTrait.php
+++ b/src/Tests/TokenTestTrait.php
@@ -9,6 +9,7 @@ namespace Drupal\token\Tests;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\Language;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Helper test trait with some added functions for testing.
@@ -21,7 +22,8 @@ trait TokenTestTrait {
 
   function assertTokens($type, array $data, array $tokens, array $options = array()) {
     $input = $this->mapTokenNames($type, array_keys($tokens));
-    $replacements = \Drupal::token()->generate($type, $input, $data, $options);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
     foreach ($tokens as $name => $expected) {
       $token = $input[$name];
       if (!isset($expected)) {
@@ -51,12 +53,12 @@ trait TokenTestTrait {
 
   function assertNoTokens($type, array $data, array $tokens, array $options = array()) {
     $input = $this->mapTokenNames($type, $tokens);
-    $replacements = \Drupal::token()->generate($type, $input, $data, $options);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $replacements = \Drupal::token()->generate($type, $input, $data, $options, $bubbleable_metadata);
     foreach ($tokens as $name) {
       $token = $input[$name];
       $this->assertTrue(!isset($replacements[$token]), t("Token value for @token was not generated.", array('@type' => $type, '@token' => $token)));
     }
-    return $values;
   }
 
   function saveAlias($source, $alias, $language = Language::LANGCODE_NOT_SPECIFIED) {
diff --git a/token.tokens.inc b/token.tokens.inc
index d601812..9920139 100644
--- a/token.tokens.inc
+++ b/token.tokens.inc
@@ -931,7 +931,7 @@ function token_tokens($type, array $tokens, array $data = array(), array $option
   if (empty($data[$type]) && ($entity_type = token_get_entity_mapping('token', $type)) && $entity_type != $type && !empty($data[$entity_type]) && empty($options['recursive'])) {
     $data[$type] = $data[$entity_type];
     $options['recursive'] = TRUE;
-    $replacements += \Drupal::moduleHandler()->invokeAll('tokens', array($type, $tokens, $data, $options));
+    $replacements += \Drupal::moduleHandler()->invokeAll('tokens', array($type, $tokens, $data, $options, $bubbleable_metadata));
   }
 
   // If the token type specifics a 'needs-data' value, and the value is not