diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index 13d8d2c..4edd74a 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -88,20 +88,6 @@ class FieldableDatabaseStorageController extends FieldableEntityStorageControlle
   protected $cacheBackend;
 
   /**
-   * The entity bundle key.
-   *
-   * @var string|bool
-   */
-  protected $bundleKey = FALSE;
-
-  /**
-   * Name of the entity class.
-   *
-   * @var string
-   */
-  protected $entityClass;
-
-  /**
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 734eb7c..defa1c2 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -276,7 +276,9 @@ function field_modules_uninstalled($modules) {
  * Clears the field info and field data caches.
  */
 function field_cache_clear() {
-  \Drupal::cache('field')->deleteAll();
+  foreach (\Drupal::entityManager()->getDefinitions() as $entity_type) {
+    \Drupal::entityManager()->getStorageController($entity_type->id())->resetCache();
+  }
   field_info_cache_clear();
 }
 
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
index bc137a5..6321c1b 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
@@ -83,7 +83,6 @@ function testDisableFilterModule() {
       'filters[filter_test_replace][status]' => 1,
     );
     $this->drupalPostForm('admin/config/content/formats/manage/' . $format_id, $edit, t('Save configuration'));
-    \Drupal::entityManager()->getStorageController('node')->resetCache(array($node->id()));
 
     // Verify that filter_test_replace filter replaced the content.
     $this->drupalGet('node/' . $node->id());