Implemented additional caching strategy