Additional changes to Cache-Control