URL Encoding fix and progress on cache impl