Move the cache test up to the other tests.
Make sure we do not set VCS_EXTRA if we are reading from the cache.
Quote everything in shell.