Refactor pulling data from cache
issue