Rebase on master

Jellyfin.Server/Program.cs

@@ -205,9 +205,9 @@ namespace Jellyfin.Server
             string cacheDir = Environment.GetEnvironmentVariable("JELLYFIN_CACHE_DIR");
             if (string.IsNullOrEmpty(cacheDir))
             {
-                if (options.ContainsOption("-cachedir"))
+                if (options.CacheDir != null)
                 {
-                    cacheDir = options.GetOption("-cachedir");
+                    cacheDir = options.CacheDir;
                 }
                 else if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {

Jellyfin.Server/StartupOptions.cs

@@ -11,6 +11,9 @@ namespace Jellyfin.Server
         [Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")]
         public string DataDir { get; set; }
 
+        [Option('C', "configdir", Required = false, HelpText = "Path to use for caching.")]
+        public string CacheDir { get; set; }
+
         [Option('c', "configdir", Required = false, HelpText = "Path to use for configuration data (user settings and pictures).")]
         public string ConfigDir { get; set; }