Some more work to CacheControl