- added caching strategy