Added initial caching of data