diff --git a/docs/cli.md b/docs/cli.md
index d9faee429d..5fd19d7aaa 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -1134,9 +1134,6 @@ The `run` command is used to execute a local pipeline script or remote pipeline
 `-cache`
 : Enable/disable processes caching.
 
-`-cloudcache`
-: Enable the use of the Cloud cache plugin for storing cache metadata to an object storage bucket.
-
 `-d, -deep`
 : Create a shallow clone of the specified depth.
 
@@ -1230,6 +1227,9 @@ The `run` command is used to execute a local pipeline script or remote pipeline
 `-with-charliecloud`
 : Enable process execution in a Charliecloud container.
 
+`-with-cloudcache`
+: Enable the use of the Cloud cache plugin for storing cache metadata to an object storage bucket.
+
 `-with-conda`
 : Use the specified Conda environment package or file (must end with `.yml` or `.yaml`)
 
diff --git a/modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy b/modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy
index a44201d35a..ec233778c9 100644
--- a/modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy
+++ b/modules/nextflow/src/main/groovy/nextflow/cli/CmdRun.groovy
@@ -111,7 +111,7 @@ class CmdRun extends CmdBase implements HubOptions {
     @Parameter(names=['-bucket-dir'], description = 'Remote bucket where intermediate result files are stored')
     String bucketDir
 
-    @Parameter(names=['-cloudcache'], description = 'Enable the use of object storage bucket as storage for cache meta-data')
+    @Parameter(names=['-with-cloudcache'], description = 'Enable the use of object storage bucket as storage for cache meta-data')
     String cloudCachePath
 
     /**
diff --git a/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy b/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy
index ad3a32f844..eabdb84bf0 100644
--- a/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy
+++ b/modules/nextflow/src/main/groovy/nextflow/cli/Launcher.groovy
@@ -224,7 +224,7 @@ class Launcher {
                 normalized << '%all'
             }
 
-            else if( current == '-cloudcache' && (i==args.size() || args[i].startsWith('-'))) {
+            else if( current == '-with-cloudcache' && (i==args.size() || args[i].startsWith('-'))) {
                 normalized << '-'
             }
 
diff --git a/modules/nextflow/src/test/groovy/nextflow/cli/LauncherTest.groovy b/modules/nextflow/src/test/groovy/nextflow/cli/LauncherTest.groovy
index bb1c82e182..b0898f48dd 100644
--- a/modules/nextflow/src/test/groovy/nextflow/cli/LauncherTest.groovy
+++ b/modules/nextflow/src/test/groovy/nextflow/cli/LauncherTest.groovy
@@ -187,9 +187,9 @@ class LauncherTest extends Specification {
         launcher.normalizeArgs('run', '-', '-a', '-b') == ['run','-stdin', '-a', '-b']
         launcher.normalizeArgs('run') == ['run']
 
-        launcher.normalizeArgs('run','-cloudcache') == ['run', '-cloudcache', '-']
-        launcher.normalizeArgs('run','-cloudcache', '-x') == ['run', '-cloudcache', '-', '-x']
-        launcher.normalizeArgs('run','-cloudcache', 's3://foo/bar') == ['run', '-cloudcache','s3://foo/bar']
+        launcher.normalizeArgs('run','-with-cloudcache') == ['run', '-with-cloudcache', '-']
+        launcher.normalizeArgs('run','-with-cloudcache', '-x') == ['run', '-with-cloudcache', '-', '-x']
+        launcher.normalizeArgs('run','-with-cloudcache', 's3://foo/bar') == ['run', '-with-cloudcache','s3://foo/bar']
         
         launcher.normalizeArgs('run','-with-tower') == ['run', '-with-tower', '-']
         launcher.normalizeArgs('run','-with-tower', '-x') == ['run', '-with-tower', '-', '-x']