Implemented and tested caching