Add support for --cache and --version