Merge branch 'fix_cache' into lessapt

Conflicts:
	tools/build_libvirt.sh