updates to refactor caching