Maps

- Removed maps that are no longer supported in the cache
- Added new maps into the cache
- Removed duplicate entries