Update

Added static map caching