Further tweak CacheDir for races#4844

mwichmann wants to merge 1 commit intoSCons:masterSCons/scons:masterfrom

mwichmann:fix/cachedir-race-againmwichmann/scons:fix/cachedir-race-againCopy head branch name to clipboard