Leaving /var/cache in place - it's expected to be there
Added machine configuration for meaningful names in logs, vms, etc
Added configuration for JDK and Postgres