Fix caching for URLs that format differently from the raw value