fixing up some issues with caching responses