Fixed the cache layer