Remove old caching references