Added local caching of response