Cleaning up caching and removing unnecessary api calls for geospatial data