Switch from Expires to CacheControl headers