Move more cache headers out of public API.
Merge pull request #461 from square/jwilson_0119_more_cache_headers

Move more cache headers out of public API.