Add caching for VMs and some other treats