revert some of the work done in "bug1019528 - use of cachecontrol" since...

... it breaks inbound hunting