diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
index 4e22dbd04a..eb5c2954c6 100644
--- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
+++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -421,11 +421,16 @@ private static void SetGlobalOptions(IList<string> args, ChocolateyConfiguration
                                 if (timeout > 0 || timeoutString.IsEqualTo("0"))
                                 {
                                     config.CommandExecutionTimeoutSeconds = timeout;
+                                    config.CommandExecutionTimeoutSecondsArgumentWasPassed = true;
                                 }
                             })
                         .Add("c=|cache=|cachelocation=|cache-location=",
                              "CacheLocation - Location for download cache, defaults to %TEMP% or value in chocolatey.config file.",
-                             option => config.CacheLocation = option.UnquoteSafe())
+                             option =>
+                             {
+                                 config.CacheLocation = option.UnquoteSafe();
+                                 config.CacheLocationArgumentWasPassed = true;
+                             })
                         .Add("allowunofficial|allow-unofficial|allowunofficialbuild|allow-unofficial-build",
                              "AllowUnofficialBuild - When not using the official build you must set this flag for choco to continue.",
                              option => config.AllowUnofficialBuild = option != null)
diff --git a/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs b/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
index cb7a554c17..54d60ee702 100644
--- a/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
+++ b/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
@@ -254,8 +254,10 @@ private void AppendOutput(StringBuilder propertyValues, string append)
 
         // configuration set variables
         public string CacheLocation { get; set; }
+        public bool CacheLocationArgumentWasPassed { get; set; }
 
         public int CommandExecutionTimeoutSeconds { get; set; }
+        public bool CommandExecutionTimeoutSecondsArgumentWasPassed { get; set; }
         public int WebRequestTimeoutSeconds { get; set; }
         public string DefaultTemplateName { get; set; }
 
diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
index a11b1fb6d6..f29b697aad 100644
--- a/src/chocolatey/infrastructure.app/services/NugetService.cs
+++ b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -1919,6 +1919,16 @@ protected virtual ChocolateyConfiguration SetConfigFromRememberedArguments(Choco
             ConfigurationOptions.OptionSet.Parse(packageArguments);
 
             // there may be overrides from the user running upgrade
+            if (!string.IsNullOrWhiteSpace(originalConfig.PackageParameters)) 
+            {
+                config.PackageParameters = originalConfig.PackageParameters;
+            }
+            
+            if (!string.IsNullOrWhiteSpace(originalConfig.InstallArguments))
+            {
+                config.InstallArguments = originalConfig.InstallArguments;
+            }
+            
             if (!string.IsNullOrWhiteSpace(originalConfig.SourceCommand.Username))
             {
                 config.SourceCommand.Username = originalConfig.SourceCommand.Username;
@@ -1939,6 +1949,16 @@ protected virtual ChocolateyConfiguration SetConfigFromRememberedArguments(Choco
                 config.SourceCommand.CertificatePassword = originalConfig.SourceCommand.CertificatePassword;
             }
 
+            if (originalConfig.CacheLocationArgumentWasPassed && !string.IsNullOrWhiteSpace(originalConfig.CacheLocation))
+            {
+                config.CacheLocation = originalConfig.CacheLocation;
+            }
+
+            if (originalConfig.CommandExecutionTimeoutSecondsArgumentWasPassed)
+            {
+                config.CommandExecutionTimeoutSeconds = originalConfig.CommandExecutionTimeoutSeconds;
+            }
+
             return originalConfig;
         }