diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
index 7aa30a8..9113416 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
@@ -416,11 +416,12 @@ protected function computeFilterCacheId($text, $format_id = NULL, $langcode = ''
     }
 
     // Compute the cache key if the text is cacheable.
-    $cache = $cache && !empty($format->cache);
     $cache_id = '';
     if ($cache) {
-      return $format->format . ':' . $langcode . ':' . hash('sha256', $text);
+      $cache_id = $format->format . ':' . $langcode . ':' . hash('sha256', $text);
     }
+
+    return $cache_id;
   }
 
 }