diff --git a/core/lib/Drupal/Core/Render/ElementInfoManager.php b/core/lib/Drupal/Core/Render/ElementInfoManager.php
index 1dd2be4..2df59c4 100644
--- a/core/lib/Drupal/Core/Render/ElementInfoManager.php
+++ b/core/lib/Drupal/Core/Render/ElementInfoManager.php
@@ -90,6 +90,16 @@ protected function buildInfo() {
 
   /**
    * {@inheritdoc}
+   */
+  public function clearCachedDefinitions() {
+    parent::clearCachedDefinitions();
+
+    // Force the element info to be rebuilt.
+    unset($this->elementInfo);
+  }
+
+  /**
+   * {@inheritdoc}
    *
    * @return \Drupal\Core\Render\Element\ElementInterface
    */