Merge "Add proper qemu-caching for source image"