Added initial version of cache