Removing more cache-related code.