Added Code for caching