Remove cache-related changes