Various URLCache improvements and todos