Tidy up the installer caching, etc