diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index e6ebdbe..3973db6 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -245,7 +245,7 @@ function options_field_entity_delete(FieldInterface $field) {
 function options_allowed_values(FieldDefinitionInterface $field_definition, EntityInterface $entity) {
   $allowed_values = &drupal_static(__FUNCTION__, array());
 
-  $cache_id = implode(':', array($entity->entityType(), $entity->bundle(), $field_definition->getFieldName()));
+  $cache_id = implode(':', array($entity->entityType(), $entity->bundle(), $entity->uuid));
   if (!isset($allowed_values[$cache_id])) {
     $function = $field_definition->getFieldSetting('allowed_values_function');
     // If $cacheable is FALSE, then the allowed values are not statically