Added structure to data stored and retrieved from cache and interface for this data