refactored enum *_data_state for maps and caches to avoid possible collisions when including both of their header files.