fixing up caching