Update package Cache attribute to new attribute values

Closes wixtoolset/issues#5125

24 files changed, 311 insertions, 129 deletions

diff --git a/src/api/wix/WixToolset.Data/BundleCacheType.cs b/src/api/wix/WixToolset.Data/BundleCacheType.cs
new file mode 100644
index 00000000..7d297d4b
--- /dev/null
+++ b/src/api/wix/WixToolset.Data/BundleCacheType.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Data
+{
+    /// <summary>
+    /// Keep, Remove, Force xml simple type.
+    /// </summary>
+    public enum BundleCacheType
+    {
+        /// <summary>The keep value.</summary>
+        Keep,
+
+        /// <summary>The remove value.</summary>
+        Remove,
+
+        /// <summary>The force value.</summary>
+        Force,
+    }
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
index cbe7f761..3d1a6ce8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
@@ -117,9 +117,9 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePackageSymbolFields.InstallCondition, value);
         }
 
-        public YesNoAlwaysType Cache
+        public BundleCacheType? Cache
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out BundleCacheType value) ? value : (BundleCacheType?)null;
             set => this.Set((int)WixBundlePackageSymbolFields.Cache, value.ToString().ToLowerInvariant());
         }
 
diff --git a/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs b/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs
deleted file mode 100644
index 3b4ca5d7..00000000
--- a/src/api/wix/WixToolset.Data/YesNoAlwaysType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Data
-{
-    /// <summary>
-    /// Yes, No, Always xml simple type.
-    /// </summary>
-    public enum YesNoAlwaysType
-    {
-        /// <summary>Not a valid yes, no or always value.</summary>
-        IllegalValue = -2,
-
-        /// <summary>Value not set; equivalent to null for reference types.</summary>
-        NotSet = -1,
-
-        /// <summary>The no value.</summary>
-        No,
-
-        /// <summary>The yes value.</summary>
-        Yes,
-
-        /// <summary>The always value.</summary>
-        Always,
-    }
-}
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs
index d3e87d2a..ee15852f 100644
--- a/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs
+++ b/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs
@@ -20,7 +20,7 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
             </ExePackage>
         </PackageGroup>
@@ -35,7 +35,7 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Size="54284816" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
@@ -50,7 +50,7 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x64)" Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)" Size="26090616" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs
index e97b3144..909380d5 100644
--- a/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs
+++ b/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs
@@ -20,7 +20,7 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Size="7841808" Version="3.1.12.21070" />
             </ExePackage>
         </PackageGroup>
@@ -35,7 +35,7 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Size="48590696" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
@@ -50,7 +50,7 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
-            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="no">
+            <ExePackage InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="remove">
                 <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)" Size="23392184" Version="3.1.12.29719" />
             </ExePackage>
         </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx452.wxs b/src/ext/NetFx/wixlib/NetFx452.wxs
index 6c55a563..e0b2f0f2 100644
--- a/src/ext/NetFx/wixlib/NetFx452.wxs
+++ b/src/ext/NetFx/wixlib/NetFx452.wxs
@@ -31,7 +31,7 @@
     <WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx452WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452WebDetectCondition)" InstallCondition="!(wix.NetFx452WebInstallCondition)" Id="$(var.NetFx452WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullWebLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe" DownloadUrl="$(var.NetFx452WebLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E" ProductName="Microsoft .NET Framework 4.5.2" Size="1118920" Version="4.5.51209.34209" />
       </ExePackage>
     </PackageGroup>
@@ -53,7 +53,7 @@
     <WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx452RedistId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx452RedistDetectCondition)" InstallCondition="!(wix.NetFx452RedistInstallCondition)" Id="$(var.NetFx452RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx452FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx452RedistLink)" Description="Microsoft .NET Framework 4.5.2 Setup" Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D" ProductName="Microsoft .NET Framework 4.5.2" Size="69999448" Version="4.5.51209.34209" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx46.wxs b/src/ext/NetFx/wixlib/NetFx46.wxs
index 99560a98..535747e0 100644
--- a/src/ext/NetFx/wixlib/NetFx46.wxs
+++ b/src/ext/NetFx/wixlib/NetFx46.wxs
@@ -32,7 +32,7 @@
     <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx46WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" DownloadUrl="$(var.NetFx46WebLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" ProductName="Microsoft .NET Framework 4.6" Size="1497400" Version="4.6.81.0" />
       </ExePackage>
     </PackageGroup>
@@ -54,7 +54,7 @@
     <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx46RedistId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx46RedistLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" ProductName="Microsoft .NET Framework 4.6" Size="65444688" Version="4.6.81.0" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx461.wxs b/src/ext/NetFx/wixlib/NetFx461.wxs
index d47e75bd..e89bf7be 100644
--- a/src/ext/NetFx/wixlib/NetFx461.wxs
+++ b/src/ext/NetFx/wixlib/NetFx461.wxs
@@ -31,7 +31,7 @@
     <WixVariable Id="NetFx461WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx461WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461WebDetectCondition)" InstallCondition="!(wix.NetFx461WebInstallCondition)" Id="$(var.NetFx461WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe" DownloadUrl="$(var.NetFx461WebLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E" ProductName="Microsoft .NET Framework 4.6.1" Size="1424328" Version="4.6.1055.0" />
       </ExePackage>
     </PackageGroup>
@@ -53,7 +53,7 @@
     <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx461RedistId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx461RedistDetectCondition)" InstallCondition="!(wix.NetFx461RedistInstallCondition)" Id="$(var.NetFx461RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx461FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx461RedistLink)" Description="Microsoft .NET Framework 4.6.1 Setup" Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F" ProductName="Microsoft .NET Framework 4.6.1" Size="67681000" Version="4.6.1055.0" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx462.wxs b/src/ext/NetFx/wixlib/NetFx462.wxs
index b5e4b533..9ae5ad31 100644
--- a/src/ext/NetFx/wixlib/NetFx462.wxs
+++ b/src/ext/NetFx/wixlib/NetFx462.wxs
@@ -31,7 +31,7 @@
     <WixVariable Id="NetFx462WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx462WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx462WebDetectCondition)" InstallCondition="!(wix.NetFx462WebInstallCondition)" Id="$(var.NetFx462WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx462FullLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" DownloadUrl="$(var.NetFx462WebLink)" Description="Microsoft .NET Framework 4.6.2 Setup" Hash="72CC8904EA9AC4248874FD888E2C63737DFFF920E4002EB1426318EFD2650D1D5055DFC80C1F398278F7246A3827FC0ED3C044471C67A40CDE66D3796F854DCE" ProductName="Microsoft .NET Framework 4.6.2" Size="1408232" Version="4.6.1590.0" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx472.wxs b/src/ext/NetFx/wixlib/NetFx472.wxs
index c54e7957..3a8009e5 100644
--- a/src/ext/NetFx/wixlib/NetFx472.wxs
+++ b/src/ext/NetFx/wixlib/NetFx472.wxs
@@ -29,7 +29,7 @@
     <WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx472WebId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472WebDetectCondition)" InstallCondition="!(wix.NetFx472WebInstallCondition)" Id="$(var.NetFx472WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472WebLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe" DownloadUrl="$(var.NetFx472WebLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="213CDEE35D320FE126CB64FE59963DB355062A14592E0B2FC4D45C2EDEF5F6A91305D0674D27152869202E3440090DFC207A0C5EB14D812F61E437907A81887E" ProductName="Microsoft .NET Framework 4.7.2" Size="1399888" Version="4.7.3081.0" />
       </ExePackage>
     </PackageGroup>
@@ -51,7 +51,7 @@
     <WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
     <PackageGroup Id="$(var.NetFx472RedistId)">
-      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog" Cache="no">
+      <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx472RedistDetectCondition)" InstallCondition="!(wix.NetFx472RedistInstallCondition)" Id="$(var.NetFx472RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx472RedistLog" Cache="remove">
         <ExePackagePayload Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx472RedistLink)" Description="Microsoft .NET Framework 4.7.2 Setup" Hash="F4EA32D8189DD269FF02D68B39D7DE866AE5F46EEA5A71BF8F4715FB0E4F8B7AC64B274DFA7BFF69B52C719E65256906C8D92FDD355F52C977175AE3E1919098" ProductName="Microsoft .NET Framework 4.7.2" Size="83940592" Version="4.7.3081.0" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs
index be307219..ef8f2f54 100644
--- a/src/ext/NetFx/wixlib/NetFx48.wxs
+++ b/src/ext/NetFx/wixlib/NetFx48.wxs
@@ -29,7 +29,7 @@
         <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
 
         <PackageGroup Id="$(var.NetFx48WebId)">
-            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog" Cache="no">
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog" Cache="remove">
                 <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" ProductName="Microsoft .NET Framework 4.8" Size="1439328" Version="4.8.4115.0" />
             </ExePackage>
         </PackageGroup>
@@ -51,7 +51,7 @@
         <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
 
         <PackageGroup Id="$(var.NetFx48RedistId)">
-            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog" Cache="no">
+            <ExePackage InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog" Cache="remove">
                 <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="DE7FD1B245BAAAC3A2BA1C2C650492AB71EB689902E281DDA02B069A441BAF9B1CF067D596C2E67C27EB58C341F572D8E7D481EC5D6E3A4CFB8D0C9AA7B55181" ProductName="Microsoft .NET Framework 4.8" Size="121319368" Version="4.8.4115.0" />
             </ExePackage>
         </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
index 9218e823..3a15fdbb 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wxs
@@ -8,7 +8,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
index 1590574f..3a9fd61d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wxs
@@ -8,7 +8,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
index 026100fa..670a812c 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wxs
@@ -9,7 +9,7 @@
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
index 8ee40558..f371f674 100644
--- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wxs
@@ -4,7 +4,7 @@
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="TestExe" Cache="no" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
+      <ExePackage Id="TestExe" Cache="remove" PerMachine="yes" Permanent="yes" InstallArguments="/ec 1603">
         <PayloadGroupRef Id="TestExePayloads" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
index 204e66ab..03b3538b 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wxs
@@ -9,7 +9,7 @@
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Vital="no" />
-      <ExePackage Id="ExeA" Cache="no" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
+      <ExePackage Id="ExeA" Cache="remove" Vital="no" PerMachine="yes" InstallArguments="/ec 1603"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)">
         <Provides Key="$(var.TestGroupName)_ExeA,v1.0" Version="$(var.Version)" />
         <PayloadGroupRef Id="TestExePayloads" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
index c8ca4a3f..30fba657 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOn.wxs
@@ -9,7 +9,7 @@
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
-      <ExePackage Id="ExeA" Cache="no" PerMachine="yes"
+      <ExePackage Id="ExeA" Cache="remove" PerMachine="yes"
                   DetectCondition="ExeA_Version AND ExeA_Version &gt;= v$(var.Version)"
                   InstallArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
                   RepairArguments="/regw &quot;HKLM\$(var.TestExeRegistryKey),Version,String,$(var.Version)&quot;"
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index c903988b..455ea1e1 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -16,7 +16,7 @@
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
-      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="always" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" Cache="force" />
     </PackageGroup>
   </Fragment>
 </Wix>
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index e42d0605..a343f35a 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -224,7 +224,7 @@ namespace WixToolset.Converters
                 { WixConverter.ModuleElementName, this.ConvertModuleElement },
                 { WixConverter.MsiPackageElementName, this.ConvertWindowsInstallerPackageElement },
                 { WixConverter.MspPackageElementName, this.ConvertWindowsInstallerPackageElement },
-                { WixConverter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.MsuPackageElementName, this.ConvertMsuPackageElement },
                 { WixConverter.OldProvidesElementName, this.ConvertProvidesElement },
                 { WixConverter.OldRequiresElementName, this.ConvertRequiresElement },
                 { WixConverter.OldRequiresRefElementName, this.ConvertRequiresRefElement },
@@ -1114,6 +1114,8 @@ namespace WixToolset.Converters
         {
             this.ConvertSuppressSignatureValidation(element);
 
+            this.UpdatePackageCacheAttribute(element);
+
             foreach (var attributeName in new[] { "InstallCommand", "RepairCommand", "UninstallCommand" })
             {
                 var newName = attributeName.Replace("Command", "Arguments");
@@ -1180,6 +1182,13 @@ namespace WixToolset.Converters
             }
         }
 
+        private void ConvertMsuPackageElement(XElement element)
+        {
+            this.ConvertSuppressSignatureValidation(element);
+
+            this.UpdatePackageCacheAttribute(element);
+        }
+
         private void ConvertProductElement(XElement element)
         {
             var id = element.Attribute("Id");
@@ -1589,6 +1598,8 @@ namespace WixToolset.Converters
         {
             this.ConvertSuppressSignatureValidation(element);
 
+            this.UpdatePackageCacheAttribute(element);
+
             if (null != element.Attribute("DisplayInternalUI"))
             {
                 this.OnError(ConverterTestType.DisplayInternalUiNotConvertable, element, "The DisplayInternalUI functionality has fundamentally changed and requires BootstrapperApplication support.");
@@ -1792,6 +1803,32 @@ namespace WixToolset.Converters
             }
         }
 
+        private void UpdatePackageCacheAttribute(XElement element)
+        {
+            var cacheAttribute = element.Attribute("Cache");
+            var cacheValue = cacheAttribute?.Value;
+            string replacement = null;
+
+            switch (cacheValue)
+            {
+                case "yes":
+                    replacement = "keep";
+                    break;
+                case "no":
+                    replacement = "remove";
+                    break;
+                case "always":
+                    replacement = "force";
+                    break;
+            }
+
+            if (!String.IsNullOrEmpty(replacement) &&
+                this.OnError(ConverterTestType.BundlePackageCacheAttributeValueObsolete, element, "The chain package element 'Cache' attribute contains obsolete '{0}' value. The value should be '{1}' instead.", cacheValue, replacement))
+            {
+                cacheAttribute.SetValue(replacement);
+            }
+        }
+
         private string UpdateWin64ValueToBitnessValue(XAttribute xWin64Attribute)
         {
             var value = xWin64Attribute.Value ?? String.Empty;
@@ -2430,6 +2467,11 @@ namespace WixToolset.Converters
             /// Naked custom action and property references replaced with WixUtilExtension elements.
             /// </summary>
             UtilReferencesReplaced,
+
+            /// <summary>
+            /// Cache attribute value updated.
+            /// </summary>
+            BundlePackageCacheAttributeValueObsolete,
         }
     }
 }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index a0ee606d..04b6b89b 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -166,13 +166,13 @@ namespace WixToolset.Core.Burn.Bundles
 
                 switch (package.PackageSymbol.Cache)
                 {
-                    case YesNoAlwaysType.No:
+                    case BundleCacheType.Remove:
                         writer.WriteAttributeString("Cache", "remove");
                         break;
-                    case YesNoAlwaysType.Yes:
+                    case BundleCacheType.Keep:
                         writer.WriteAttributeString("Cache", "keep");
                         break;
-                    case YesNoAlwaysType.Always:
+                    case BundleCacheType.Force:
                         writer.WriteAttributeString("Cache", "force");
                         break;
                 }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 5655d23d..e95fee54 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -331,13 +331,13 @@ namespace WixToolset.Core.Burn.Bundles
 
                     switch (package.PackageSymbol.Cache)
                     {
-                        case YesNoAlwaysType.No:
+                        case BundleCacheType.Remove:
                             writer.WriteAttributeString("Cache", "remove");
                             break;
-                        case YesNoAlwaysType.Yes:
+                        case BundleCacheType.Keep:
                             writer.WriteAttributeString("Cache", "keep");
                             break;
-                        case YesNoAlwaysType.Always:
+                        case BundleCacheType.Force:
                             writer.WriteAttributeString("Cache", "force");
                             break;
                     }
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 6d2e75f7..1ca3fb00 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -1967,7 +1967,7 @@ namespace WixToolset.Core
             };
             string after = null;
             string installCondition = null;
-            var cache = YesNoAlwaysType.Yes; // the default is to cache everything in tradeoff for stability over disk space.
+            var cache = BundleCacheType.Keep; // the default is to cache everything in tradeoff for stability over disk space.
             string cacheId = null;
             string description = null;
             string displayName = null;
@@ -2028,19 +2028,19 @@ namespace WixToolset.Core
                         var value = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         switch (value)
                         {
-                        case "always":
-                            cache = YesNoAlwaysType.Always;
+                        case "force":
+                            cache = BundleCacheType.Force;
                             break;
-                        case "yes":
-                            cache = YesNoAlwaysType.Yes;
+                        case "keep":
+                            cache = BundleCacheType.Keep;
                             break;
-                        case "no":
-                            cache = YesNoAlwaysType.No;
+                        case "remove":
+                            cache = BundleCacheType.Remove;
                             break;
                         case "":
                             break;
                         default:
-                            this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, value, "always", "yes", "no"));
+                            this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, value, "force", "keep", "remove"));
                             break;
                         }
                         break;
@@ -2316,6 +2316,7 @@ namespace WixToolset.Core
                     Type = packageType,
                     Attributes = attributes,
                     InstallCondition = installCondition,
+                    Cache = cache,
                     CacheId = cacheId,
                     Description = description,
                     DisplayName = displayName,
@@ -2323,11 +2324,6 @@ namespace WixToolset.Core
                     RollbackLogPathVariable = rollbackPathVariable,
                 });
 
-                if (YesNoAlwaysType.NotSet != cache)
-                {
-                    chainPackageSymbol.Cache = cache;
-                }
-
                 if (YesNoType.NotSet != vital)
                 {
                     chainPackageSymbol.Vital = (vital == YesNoType.Yes);
diff --git a/src/wix/heat/Serialize/wix.cs b/src/wix/heat/Serialize/wix.cs
index e5a81cd0..b881fb92 100644
--- a/src/wix/heat/Serialize/wix.cs
+++ b/src/wix/heat/Serialize/wix.cs
@@ -253,46 +253,45 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
-        /// Parses a YesNoAlwaysType from a string.
+        /// Parses a BundleCacheType from a string.
         /// </summary>
-        public static YesNoAlwaysType ParseYesNoAlwaysType(string value)
+        public static BundleCacheType ParseBundleCacheType(string value)
         {
-            YesNoAlwaysType parsedValue;
-            Enums.TryParseYesNoAlwaysType(value, out parsedValue);
+            Enums.TryBundleCacheType(value, out var parsedValue);
             return parsedValue;
         }
         
         /// <summary>
         /// Tries to parse a YesNoAlwaysType from a string.
         /// </summary>
-        public static bool TryParseYesNoAlwaysType(string value, out YesNoAlwaysType parsedValue)
+        public static bool TryBundleCacheType(string value, out BundleCacheType parsedValue)
         {
-            parsedValue = YesNoAlwaysType.NotSet;
+            parsedValue = BundleCacheType.NotSet;
             if (string.IsNullOrEmpty(value))
             {
                 return false;
             }
-            if (("always" == value))
+
+            if (("force" == value))
             {
-                parsedValue = YesNoAlwaysType.always;
+                parsedValue = BundleCacheType.force;
             }
             else
             {
-                if (("no" == value))
+                if (("remove" == value))
                 {
-                    parsedValue = YesNoAlwaysType.no;
+                    parsedValue = BundleCacheType.remove;
                 }
                 else
                 {
-                    if (("yes" == value))
+                    if (("keep" == value))
                     {
-                        parsedValue = YesNoAlwaysType.yes;
+                        parsedValue = BundleCacheType.keep;
                     }
                     else
                     {
-                        parsedValue = YesNoAlwaysType.IllegalValue;
                         return false;
                     }
                 }
@@ -656,18 +655,15 @@ namespace WixToolset.Harvesters.Serialize
     /// Values of this type will either be "always", "yes", or "no".
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
-    public enum YesNoAlwaysType
+    public enum BundleCacheType
     {
-        
-        IllegalValue = int.MaxValue,
-        
         NotSet = -1,
         
-        always,
+        force,
         
-        no,
+        remove,
         
-        yes,
+        keep,
     }
     
     /// <summary>
@@ -3732,7 +3728,7 @@ namespace WixToolset.Harvesters.Serialize
         
         private bool installConditionFieldSet;
         
-        private YesNoAlwaysType cacheField;
+        private BundleCacheType cacheField;
         
         private bool cacheFieldSet;
         
@@ -3939,7 +3935,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// Whether to cache the package. The default is "yes".
         /// </summary>
-        public YesNoAlwaysType Cache
+        public BundleCacheType Cache
         {
             get
             {
@@ -4285,17 +4281,17 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (this.cacheFieldSet)
             {
-                if ((this.cacheField == YesNoAlwaysType.always))
+                if ((this.cacheField == BundleCacheType.force))
                 {
-                    writer.WriteAttributeString("Cache", "always");
+                    writer.WriteAttributeString("Cache", "force");
                 }
-                if ((this.cacheField == YesNoAlwaysType.no))
+                if ((this.cacheField == BundleCacheType.remove))
                 {
-                    writer.WriteAttributeString("Cache", "no");
+                    writer.WriteAttributeString("Cache", "remove");
                 }
-                if ((this.cacheField == YesNoAlwaysType.yes))
+                if ((this.cacheField == BundleCacheType.keep))
                 {
-                    writer.WriteAttributeString("Cache", "yes");
+                    writer.WriteAttributeString("Cache", "keep");
                 }
             }
             if (this.cacheIdFieldSet)
@@ -4463,7 +4459,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (("Cache" == name))
             {
-                this.cacheField = Enums.ParseYesNoAlwaysType(value);
+                this.cacheField = Enums.ParseBundleCacheType(value);
                 this.cacheFieldSet = true;
             }
             if (("CacheId" == name))
@@ -4571,7 +4567,7 @@ namespace WixToolset.Harvesters.Serialize
         
         private bool installConditionFieldSet;
         
-        private YesNoAlwaysType cacheField;
+        private BundleCacheType cacheField;
         
         private bool cacheFieldSet;
         
@@ -4767,9 +4763,9 @@ namespace WixToolset.Harvesters.Serialize
         }
         
         /// <summary>
-        /// Whether to cache the package. The default is "yes".
+        /// Whether to cache the package. The default is "keep".
         /// </summary>
-        public YesNoAlwaysType Cache
+        public BundleCacheType Cache
         {
             get
             {
@@ -5073,17 +5069,17 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (this.cacheFieldSet)
             {
-                if ((this.cacheField == YesNoAlwaysType.always))
+                if ((this.cacheField == BundleCacheType.force))
                 {
-                    writer.WriteAttributeString("Cache", "always");
+                    writer.WriteAttributeString("Cache", "force");
                 }
-                if ((this.cacheField == YesNoAlwaysType.no))
+                if ((this.cacheField == BundleCacheType.remove))
                 {
-                    writer.WriteAttributeString("Cache", "no");
+                    writer.WriteAttributeString("Cache", "remove");
                 }
-                if ((this.cacheField == YesNoAlwaysType.yes))
+                if ((this.cacheField == BundleCacheType.keep))
                 {
-                    writer.WriteAttributeString("Cache", "yes");
+                    writer.WriteAttributeString("Cache", "keep");
                 }
             }
             if (this.cacheIdFieldSet)
@@ -5233,7 +5229,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (("Cache" == name))
             {
-                this.cacheField = Enums.ParseYesNoAlwaysType(value);
+                this.cacheField = Enums.ParseBundleCacheType(value);
                 this.cacheFieldSet = true;
             }
             if (("CacheId" == name))
@@ -5331,7 +5327,7 @@ namespace WixToolset.Harvesters.Serialize
         
         private bool installConditionFieldSet;
         
-        private YesNoAlwaysType cacheField;
+        private BundleCacheType cacheField;
         
         private bool cacheFieldSet;
         
@@ -5529,7 +5525,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// Whether to cache the package. The default is "yes".
         /// </summary>
-        public YesNoAlwaysType Cache
+        public BundleCacheType Cache
         {
             get
             {
@@ -5838,17 +5834,17 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (this.cacheFieldSet)
             {
-                if ((this.cacheField == YesNoAlwaysType.always))
+                if ((this.cacheField == BundleCacheType.force))
                 {
-                    writer.WriteAttributeString("Cache", "always");
+                    writer.WriteAttributeString("Cache", "force");
                 }
-                if ((this.cacheField == YesNoAlwaysType.no))
+                if ((this.cacheField == BundleCacheType.remove))
                 {
-                    writer.WriteAttributeString("Cache", "no");
+                    writer.WriteAttributeString("Cache", "remove");
                 }
-                if ((this.cacheField == YesNoAlwaysType.yes))
+                if ((this.cacheField == BundleCacheType.keep))
                 {
-                    writer.WriteAttributeString("Cache", "yes");
+                    writer.WriteAttributeString("Cache", "keep");
                 }
             }
             if (this.cacheIdFieldSet)
@@ -5980,7 +5976,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (("Cache" == name))
             {
-                this.cacheField = Enums.ParseYesNoAlwaysType(value);
+                this.cacheField = Enums.ParseBundleCacheType(value);
                 this.cacheFieldSet = true;
             }
             if (("CacheId" == name))
@@ -6078,7 +6074,7 @@ namespace WixToolset.Harvesters.Serialize
         
         private bool installConditionFieldSet;
         
-        private YesNoAlwaysType cacheField;
+        private BundleCacheType cacheField;
         
         private bool cacheFieldSet;
         
@@ -6294,7 +6290,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// Whether to cache the package. The default is "yes".
         /// </summary>
-        public YesNoAlwaysType Cache
+        public BundleCacheType Cache
         {
             get
             {
@@ -6675,17 +6671,17 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (this.cacheFieldSet)
             {
-                if ((this.cacheField == YesNoAlwaysType.always))
+                if ((this.cacheField == BundleCacheType.force))
                 {
-                    writer.WriteAttributeString("Cache", "always");
+                    writer.WriteAttributeString("Cache", "force");
                 }
-                if ((this.cacheField == YesNoAlwaysType.no))
+                if ((this.cacheField == BundleCacheType.remove))
                 {
-                    writer.WriteAttributeString("Cache", "no");
+                    writer.WriteAttributeString("Cache", "remove");
                 }
-                if ((this.cacheField == YesNoAlwaysType.yes))
+                if ((this.cacheField == BundleCacheType.keep))
                 {
-                    writer.WriteAttributeString("Cache", "yes");
+                    writer.WriteAttributeString("Cache", "keep");
                 }
             }
             if (this.cacheIdFieldSet)
@@ -6855,7 +6851,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             if (("Cache" == name))
             {
-                this.cacheField = Enums.ParseYesNoAlwaysType(value);
+                this.cacheField = Enums.ParseBundleCacheType(value);
                 this.cacheFieldSet = true;
             }
             if (("CacheId" == name))
diff --git a/src/wix/test/WixToolsetTest.Converters/BundleCacheFixture.cs b/src/wix/test/WixToolsetTest.Converters/BundleCacheFixture.cs
new file mode 100644
index 00000000..d1ba0cbf
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Converters/BundleCacheFixture.cs
@@ -0,0 +1,154 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.Converters
+{
+    using System;
+    using System.Xml.Linq;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Converters;
+    using WixToolsetTest.Converters.Mocks;
+    using Xunit;
+
+    public class BundleCacheFixture : BaseConverterFixture
+    {
+        [Fact]
+        public void CanConvertExeAlwaysCache()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <PackageGroup Id='exe'>",
+                "      <ExePackage InstallCommand='-install' RepairCommand='-repair' UninstallCommand='-uninstall' Cache='always' SourceFile='test.exe' />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <PackageGroup Id=\"exe\">",
+                "      <ExePackage Cache=\"force\" SourceFile=\"test.exe\" InstallArguments=\"-install\" RepairArguments=\"-repair\" UninstallArguments=\"-uninstall\" />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(4, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void CanConvertMsiNoCache()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <PackageGroup Id='msi'>",
+                "      <MsiPackage Cache='no' SourceFile='test.msi' />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <PackageGroup Id=\"msi\">",
+                "      <MsiPackage Cache=\"remove\" SourceFile=\"test.msi\" />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(1, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void CanConvertMspYesCache()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <PackageGroup Id='exe'>",
+                "      <MspPackage Cache='yes' SourceFile='test.msp' />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <PackageGroup Id=\"exe\">",
+                "      <MspPackage Cache=\"keep\" SourceFile=\"test.msp\" />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(1, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void CanConvertMsuYesCache()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <PackageGroup Id='exe'>",
+                "      <MsuPackage Cache='yes' SourceFile='test.msp' />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <PackageGroup Id=\"exe\">",
+                "      <MsuPackage Cache=\"keep\" SourceFile=\"test.msp\" />",
+                "    </PackageGroup>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(1, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+    }
+}