Move more cache headers out of public API.