Fix caching of disk instances