diff --git a/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index 8bb596d..5ec7253 100644
--- a/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 8ec059c..6121f8f 100644
--- a/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index b3f9a20..e59f60e 100644
--- a/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index f9d9f3d..5a5d415 100644
--- a/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index df95734..3451829 100644
--- a/tests/MdXaml.Test/Out/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>
diff --git a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index 8bb596d..5ec7253 100644
--- a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 8ec059c..6121f8f 100644
--- a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index b3f9a20..e59f60e 100644
--- a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index f9d9f3d..5a5d415 100644
--- a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index df95734..3451829 100644
--- a/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>
diff --git a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index 745e8f0..8637e64 100644
--- a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 540e923..7ee6a16 100644
--- a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index 4d2aaa3..0305c44 100644
--- a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index 40d660f..a22dc22 100644
--- a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index 4a2bfcb..875c184 100644
--- a/tests/MdXaml.Test/Out/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/Out/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.Test;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>
diff --git a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index a66656b..5771617 100644
--- a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 278f889..30f49e5 100644
--- a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index fbd1be4..6a076e1 100644
--- a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index e3a2d47..17fa8e2 100644
--- a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index 9cda2bf..4d879a6 100644
--- a/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/core/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>
diff --git a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index a66656b..5771617 100644
--- a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 278f889..30f49e5 100644
--- a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index fbd1be4..6a076e1 100644
--- a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index e3a2d47..17fa8e2 100644
--- a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index 9cda2bf..4d879a6 100644
--- a/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/dotnet/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.6608276367188" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.1552734375" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>
diff --git a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
index b0e6a62..088be78 100644
--- a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages1_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
index 99b3cf1..c1cc1df 100644
--- a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenImages3_generatesExpectedResult.approved.txt
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-16"?>
 <FlowDocument Style="{x:Null}" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
-  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+  <Paragraph>A remote <Image Tag="image" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>Images side by side <Image Tag="imageleft" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image><Image Tag="imageright" Width="1" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <Paragraph>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
-  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
+  <Paragraph>A resource image <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>. A local image <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>.</Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
index e09c2f1..2acc2b2 100644
--- a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline1_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)" ToolTip="&quot;and a title&quot;&#xD;&#xA;/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
index e566101..38b6c85 100644
--- a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenLinksInline2_generatesExpectedResult.approved.txt
@@ -27,37 +27,37 @@
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>
     </Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text<Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image>text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Hyperlink>
   </Paragraph>
   <Paragraph>
     <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">
       <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
         <Image.Source>
-          <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+          <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
         </Image.Source>
       </Image> text</Hyperlink>
   </Paragraph>
   <Paragraph>
-    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
+    <Hyperlink Command="GoToPage" CommandParameter="/foo(bar)">text <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image> text</Hyperlink>
   </Paragraph>
 </FlowDocument>
diff --git a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
index e3d81ab..ed0b4a2 100644
--- a/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
+++ b/tests/MdXaml.Test/OutMF/framework/Tests.Transform_givenMixing_generatesExpectedResult.approved.txt
@@ -30,19 +30,19 @@
   <Paragraph>
     <Image Tag="image1" Width="1" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/350x150" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/350x150" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
   <Paragraph>
     <Image Tag="imageleft" Width="1" Margin="0,0,0,0" ToolTip="blue">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/0000FF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
     <Image Tag="imageright" Width="1" Margin="0,0,0,0" ToolTip="cyan">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="http://placehold.it/100x150/00FFFF" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
     </Image>
   </Paragraph>
@@ -54,9 +54,9 @@
   <Paragraph>
     <Image Tag="image" Width="701.660803964984" Margin="0,0,0,0">
       <Image.Source>
-        <BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" />
+        <BitmapImage BaseUri="{x:Null}" UriSource="pack://application:,,,/MdXaml.TestMigfree;Component/RscImg.png" CreateOptions="None" CacheOption="OnLoad" />
       </Image.Source>
-    </Image> <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriCachePolicy="BypassCache" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="IgnoreImageCache" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
+    </Image> <Image Tag="image" Width="384.155275164404" Margin="0,0,0,0"><Image.Source><BitmapImage BaseUri="{x:Null}" UriSource="<assetpathroot>\ExtImg.png" CreateOptions="None" CacheOption="OnLoad" /></Image.Source></Image></Paragraph>
   <List MarkerStyle="Disc">
     <ListItem>
       <Paragraph>Table</Paragraph>