removed unused nonfunctional caching code from cache and map