diff --git a/Docs/commands-help/shortcuts/cache.md b/Docs/commands-help/shortcuts/cache.md
index 91784d97..edf8ad8b 100644
--- a/Docs/commands-help/shortcuts/cache.md
+++ b/Docs/commands-help/shortcuts/cache.md
@@ -12,8 +12,6 @@
 
  Options:
 ╭─────────────────────────────────────────────────────────────────────────────────────────────╮
-│ --warmup                   * Warmup cache with this endpoint.                               │
-│ --headers []               * Extra HTTP header fields for warmup ("s3-key: my-secret-key"). │
 │ -s, --sdk                  * Build SDK: sim or ios.                                         │
 │ -a, --arch                 * Build architecture: auto, x86_64 or arm64.                     │
 │ -c, --config               * Build configuration. (Debug)                                   │
@@ -22,6 +20,8 @@
 │ -e, --except []            * Target names to exclude.                                       │
 │ -x, --except-as-regex []   * Regular expression patterns to exclude targets.                │
 │ --result-bundle-path       * Path to xcresult bundle.                                       │
+│ --warmup                   * Warmup cache with this endpoint.                               │
+│ --headers []               * Extra HTTP header fields for warmup ("s3-key: my-secret-key"). │
 │ --max-connections          * The maximum number of simultaneous connections. (10)           │
 │ --archive-type             * Binary archive file type to use: zip or 7z.                    │
 │ -o, --output               * Output mode: fold, multiline, silent, raw.                     │
diff --git a/Sources/Rugby/Commands/Mixed/Shortcuts.swift b/Sources/Rugby/Commands/Mixed/Shortcuts.swift
index b3ff2f97..5049f17e 100644
--- a/Sources/Rugby/Commands/Mixed/Shortcuts.swift
+++ b/Sources/Rugby/Commands/Mixed/Shortcuts.swift
@@ -69,24 +69,24 @@ extension Shortcuts {
         @Flag(name: .long, help: "Prebuild targets ignoring sources.")
         var prebuild = false
 
-        @Option(help: "Warmup cache with this endpoint.")
-        var warmup: String?
-
-        @Option(help: "Extra HTTP header fields for warmup (\"s3-key: my-secret-key\").")
-        var headers: [String] = []
-
         @OptionGroup
         var buildOptions: BuildOptions
 
-        @Flag(name: .long, help: "Ignore shared cache.")
-        var ignoreCache = false
-
         @Option(name: .long, help: "Path to xcresult bundle.")
         var resultBundlePath: String?
 
+        @Flag(name: .long, help: "Ignore shared cache.")
+        var ignoreCache = false
+
         @Flag(name: .long, help: "Delete target groups from project.")
         var deleteSources = false
 
+        @Option(help: "Warmup cache with this endpoint.")
+        var warmup: String?
+
+        @Option(help: "Extra HTTP header fields for warmup (\"s3-key: my-secret-key\").")
+        var headers: [String] = []
+
         @Option(help: "The maximum number of simultaneous connections.")
         var maxConnections = settings.warmupMaximumConnectionsPerHost