diff --cc core/includes/entity.inc
index 56db62d,aa74a2f..0000000
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@@ -104,7 -131,7 +104,7 @@@ function entity_get_form_modes($entity_
          $form_modes[$form_mode_entity_type][$form_mode_name] = (array) $form_mode;
        }
        drupal_alter('entity_form_mode_info', $form_modes);
-       cache()->set("entity_form_mode_info:$langcode", $form_modes, Cache::PERMANENT, array('entity_types' => TRUE));
 -      \Drupal::cache()->set("entity_form_mode_info:$langcode", $form_modes, Cache::PERMANENT, array('entity_info' => TRUE));
++      \Drupal::cache()->set("entity_form_mode_info:$langcode", $form_modes, Cache::PERMANENT, array('entity_types' => TRUE));
      }
    }
  
@@@ -142,7 -169,7 +142,7 @@@ function entity_get_view_modes($entity_
          $view_modes[$view_mode_entity_type][$view_mode_name] = (array) $view_mode;
        }
        drupal_alter('entity_view_mode_info', $view_modes);
-       cache()->set("entity_view_mode_info:$langcode", $view_modes, Cache::PERMANENT, array('entity_types' => TRUE));
 -      \Drupal::cache()->set("entity_view_mode_info:$langcode", $view_modes, Cache::PERMANENT, array('entity_info' => TRUE));
++      \Drupal::cache()->set("entity_view_mode_info:$langcode", $view_modes, Cache::PERMANENT, array('entity_types' => TRUE));
      }
    }