Minor changes to Data for sorting enums, only using cache.Descriptor