Some CacheControl refactoring