diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 9f865c3..179f961 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -41,8 +41,8 @@ function field_info_cache_clear() {
 
   // Make sure that instantiated field definition and instance entities are
   // cleared.
-  \Drupal::entityManager()->getStorageController('field_entity')->resetCache();
-  \Drupal::entityManager()->getStorageController('field_instance')->resetCache();
+  \Drupal::entityManager()->getStorageController('field_config')->resetCache();
+  \Drupal::entityManager()->getStorageController('field_instance_config')->resetCache();
 
   Field::fieldInfo()->flush();
 }
diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/lib/Drupal/field/FieldInfo.php
index 4a7a477..c579931 100644
--- a/core/modules/field/lib/Drupal/field/FieldInfo.php
+++ b/core/modules/field/lib/Drupal/field/FieldInfo.php
@@ -161,8 +161,8 @@ public function flush() {
 
     Cache::deleteTags(array('field_info' => TRUE));
 
-    \Drupal::entityManager()->getStorageController('field_entity')->resetCache();
-    \Drupal::entityManager()->getStorageController('field_instance')->resetCache();
+    \Drupal::entityManager()->getStorageController('field_config')->resetCache();
+    \Drupal::entityManager()->getStorageController('field_instance_config')->resetCache();
   }
 
   /**