Added cache management