minor ammends in caching