Updates to prevent cachedir's from pointing to non-existant dirs
Updates to prevent cachedir's from pointing to non-existant dirs

Trophime/singularity,Trophime/singularity,Trophime/singularity,Trophime/singularity