Fix cachedir
Fix cleanup