[COOK-3988] Don't unescape URI before constructing it, but unescape it while constructing the file cache's filename.
Merge pull request #63 from juliandunn/COOK-3988

[COOK-3988] Don't unescape URI before constructing it.