Add cachedir and command options