Improve heuristic for caching JSONP responses
fixup! Begin cleaning things up