Redundant enum caches

Removed redundant enum caches