Clean up and add params for "port" and "cache-dir"