Adding cache management