Address some feedback from Jeremy

* Decrease likelihood of cache collisions
* Avoid file:// urls (and therefore the need to escape)