Cache polyfill fixes
Merge branch 'master' into appengine-proxy