diff --git a/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php b/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php
index 9194880fa8..b73f3411e5 100644
--- a/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php
+++ b/core/lib/Drupal/Core/Field/FieldStorageDefinitionListener.php
@@ -86,9 +86,9 @@ public function onFieldStorageDefinitionCreate(FieldStorageDefinitionInterface $
     }
 
     $this->entityLastInstalledSchemaRepository->setLastInstalledFieldStorageDefinition($storage_definition);
-    $this->entityFieldManager->clearCachedFieldDefinitions();
 
     $this->eventDispatcher->dispatch(FieldStorageDefinitionEvents::CREATE, new FieldStorageDefinitionEvent($storage_definition));
+    $this->entityFieldManager->clearCachedFieldDefinitions();
   }
 
   /**
@@ -105,9 +105,9 @@ public function onFieldStorageDefinitionUpdate(FieldStorageDefinitionInterface $
     }
 
     $this->entityLastInstalledSchemaRepository->setLastInstalledFieldStorageDefinition($storage_definition);
-    $this->entityFieldManager->clearCachedFieldDefinitions();
 
     $this->eventDispatcher->dispatch(FieldStorageDefinitionEvents::UPDATE, new FieldStorageDefinitionEvent($storage_definition, $original));
+    $this->entityFieldManager->clearCachedFieldDefinitions();
   }
 
   /**
@@ -134,9 +134,9 @@ public function onFieldStorageDefinitionDelete(FieldStorageDefinitionInterface $
     }
 
     $this->entityLastInstalledSchemaRepository->deleteLastInstalledFieldStorageDefinition($storage_definition);
-    $this->entityFieldManager->clearCachedFieldDefinitions();
 
     $this->eventDispatcher->dispatch(FieldStorageDefinitionEvents::DELETE, new FieldStorageDefinitionEvent($storage_definition));
+    $this->entityFieldManager->clearCachedFieldDefinitions();
   }
 
 }