Cache does not cache header information
Small corrections
Merge remote-tracking branch 'upstream/master' into cache
Merge remote-tracking branch 'origin/patch-3' into patch-3