Changed --xml to --cachesnapshot, and allowed cachesnapshot to optionall search