Make sure consistent cache URLs are used throughout