Fix url cache (fixes #532 and #527)

3 files changed