Fix for http caching

@boblail  how does this look?
The second commit could be residual from some uncommited work you had in the past and got tossed into your  wip commit?