fix
move cache dir to end and fix cs