Move more cache headers out of public API.

This is a pure refactoring. No behavior changes.