Merge "Add cache-dir argument to cloner"