diff --git a/samples/ImageSharp.Web.Sample/wwwroot/imagesharp-logo.png b/samples/ImageSharp.Web.Sample/wwwroot/imagesharp-logo.png
deleted file mode 100644
index 0b661ed7..00000000
--- a/samples/ImageSharp.Web.Sample/wwwroot/imagesharp-logo.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e0e61e92427f3686cf4558193c077ab0ec78b5c869e90445147c0c67d66ce10
-size 25255
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/index.html b/samples/ImageSharp.Web.Sample/wwwroot/index.html
index 53cd06f0..ef3cfa4f 100644
--- a/samples/ImageSharp.Web.Sample/wwwroot/index.html
+++ b/samples/ImageSharp.Web.Sample/wwwroot/index.html
@@ -44,10 +44,10 @@ <h1>ImageSharp URI API Samples</h1>
       <h2>Unmodified</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png</code>
+          <code>sixlabors.imagesharp.web.png</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png" />
+          <img src="sixlabors.imagesharp.web.png" />
         </p>
       </div>
     </section>
@@ -55,50 +55,50 @@ <h2>Unmodified</h2>
       <h2>Resize</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300</code>
+          <code>sixlabors.imagesharp.web.png?width=300</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300" />
+          <img src="sixlabors.imagesharp.web.png?width=300" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&height=200</code>
+          <code>sixlabors.imagesharp.web.png?width=300&height=200</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&height=200" />
+          <img src="sixlabors.imagesharp.web.png?width=300&height=200" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&height=200&rmode=stretch</code>
+          <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&height=200&rmode=stretch" />
+          <img src="sixlabors.imagesharp.web.png?width=300&height=200&rmode=stretch" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&height=200&rmode=pad</code>
+          <code>sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&height=200&rmode=pad" />
+          <img src="sixlabors.imagesharp.web.png?width=300&height=200&rmode=pad&rcolor=limegreen" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&rsampler=lanczos3</code>
+          <code>sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&rsampler=lanczos3" />
+          <img src="sixlabors.imagesharp.web.png?width=300&rsampler=lanczos3" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&rsampler=nearest</code>
+          <code>sixlabors.imagesharp.web.png?width=300&rsampler=nearest</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&rsampler=nearest" />
+          <img src="sixlabors.imagesharp.web.png?width=300&rsampler=nearest" />
         </p>
       </div>
     </section>
@@ -107,34 +107,34 @@ <h2>Resize</h2>
       <h2>Format</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=jpg</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=jpg</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=jpg" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=bmp</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=bmp</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=bmp" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=bmp" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=gif</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=gif</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=gif" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=gif" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=webp</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=webp</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=webp" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=webp" />
         </p>
       </div>
     </section>
@@ -143,26 +143,26 @@ <h2>Format</h2>
       <h2>Jpeg Quality</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=jpg&quality=100</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=jpg&quality=100" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=100" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=jpg&quality=50</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=jpg&quality=50" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=50" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=jpg&quality=1</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=jpg&quality=1" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=jpg&quality=1" />
         </p>
       </div>
     </section>
@@ -171,26 +171,26 @@ <h2>Jpeg Quality</h2>
       <h2>Webp Quality</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=webp&quality=100</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=100</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=webp&quality=100" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=100" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=webp&quality=50</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=50</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=webp&quality=50" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=50" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&format=webp&quality=1</code>
+          <code>sixlabors.imagesharp.web.png?width=300&format=webp&quality=1</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&format=webp&quality=1" />
+          <img src="sixlabors.imagesharp.web.png?width=300&format=webp&quality=1" />
         </p>
       </div>
     </section>
@@ -199,42 +199,42 @@ <h2>Webp Quality</h2>
       <h2>Background Color</h2>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&bgcolor=red</code>
+          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=red</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&bgcolor=red" />
+          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=red" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&bgcolor=FFFF00</code>
+          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&bgcolor=FFFF00" />
+          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=FFFF00" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&bgcolor=128,28,32</code>
+          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&bgcolor=128,28,32" />
+          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&bgcolor=C1FF0080</code>
+          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&bgcolor=C1FF0080" />
+          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=C1FF0080" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=300&bgcolor=128,28,32,128</code>
+          <code>sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=300&bgcolor=128,28,32,128" />
+          <img src="sixlabors.imagesharp.web.png?width=300&bgcolor=128,28,32,128" />
         </p>
       </div>
     </section>
@@ -244,26 +244,26 @@ <h2>Identical Queries</h2>
       <p>Demonstrates that the middleware handles identical queries without file contention.</p>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=123</code>
+          <code>sixlabors.imagesharp.web.png?width=123</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=123" />
+          <img src="sixlabors.imagesharp.web.png?width=123" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=123</code>
+          <code>sixlabors.imagesharp.web.png?width=123</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=123" />
+          <img src="sixlabors.imagesharp.web.png?width=123" />
         </p>
       </div>
       <div>
         <p>
-          <code>imagesharp-logo.png?width=123</code>
+          <code>sixlabors.imagesharp.web.png?width=123</code>
         </p>
         <p>
-          <img src="imagesharp-logo.png?width=123" />
+          <img src="sixlabors.imagesharp.web.png?width=123" />
         </p>
       </div>
     </section>
@@ -394,59 +394,59 @@ <h2>EXIF Handling Portrait</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
       <div>
         <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad</code>
+          <code>Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad" /></p>
+        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=left&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -455,59 +455,59 @@ <h2>EXIF Handling Portrait</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
       <div>
         <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -516,59 +516,59 @@ <h2>EXIF Handling Portrait</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
       <div>
         <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad</code>
+          <code>Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad" /></p>
+        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=right&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -578,59 +578,59 @@ <h2>EXIF Handling Portrait</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for portrait images.</p>
       <div>
         <p>
-          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_0.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_1.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_2.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_3.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_4.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_5.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_6.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_7.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad</code>
+          <code>Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad" /></p>
+        <p><img src="Portrait_8.jpg?width=60&height=50&ranchor=bottomright&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -761,59 +761,59 @@ <h2>EXIF Handling : Landscape</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
       <div>
         <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad</code>
+          <code>Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad" /></p>
+        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=top&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -822,59 +822,59 @@ <h2>EXIF Handling : Landscape</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
       <div>
         <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad</code>
+          <code>Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad" /></p>
+        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=topright&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -883,59 +883,59 @@ <h2>EXIF Handling : Landscape</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
       <div>
         <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad</code>
+          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad" /></p>
+        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottom&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
 
@@ -944,59 +944,59 @@ <h2>EXIF Handling : Landscape</h2>
       <p>Demonstrates that the middleware handles EXIF orientation correctly for landscape images.</p>
       <div>
         <p>
-          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_0.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_1.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_2.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_3.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_4.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_5.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
 
       <div>
         <p>
-          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_6.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_7.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
       <div>
         <p>
-          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad</code>
+          <code>Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen</code>
         </p>
-        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad" /></p>
+        <p><img src="Landscape_8.jpg?width=60&height=50&ranchor=bottomleft&rmode=pad&rcolor=limegreen" /></p>
       </div>
     </section>
   </main>
diff --git a/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.png b/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.png
new file mode 100644
index 00000000..d60a4f9c
--- /dev/null
+++ b/samples/ImageSharp.Web.Sample/wwwroot/sixlabors.imagesharp.web.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e320603ed2376bf6c79180b0e611b08a1c11c4b68856327023ef4af323a55628
+size 18945
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 2bf03cfd..c2963f9b 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -17,11 +17,7 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 
   <ItemGroup>
-    <PackageReference Update="AWSSDK.S3" Version="3.7.7.16" />
-    <PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Update="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Update="SixLabors.ImageSharp"  Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
diff --git a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
index 0310d349..74af6b95 100644
--- a/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
+++ b/src/ImageSharp.Web.Providers.AWS/ImageSharp.Web.Providers.AWS.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.8.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
index 0c16153e..6c746c25 100644
--- a/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
+++ b/src/ImageSharp.Web.Providers.Azure/ImageSharp.Web.Providers.Azure.csproj
@@ -31,7 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" />
+    <!--TODO: Do not upgrade this. Last Version that supports .NET Core 2.1-->
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
index 7add7ebd..7035b48d 100644
--- a/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
+++ b/src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs
@@ -84,7 +84,7 @@ internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions,
         /// <inheritdoc/>
         public Task<IImageCacheResolver> GetAsync(string key)
         {
-            string path = ToFilePath(key, this.cacheFolderDepth);
+            string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
 
             var metaFileInfo = new FileInfo(this.ToMetaDataFilePath(path));
             if (!metaFileInfo.Exists)
diff --git a/src/ImageSharp.Web/FormattedImage.cs b/src/ImageSharp.Web/FormattedImage.cs
index c7b273b1..242bdc67 100644
--- a/src/ImageSharp.Web/FormattedImage.cs
+++ b/src/ImageSharp.Web/FormattedImage.cs
@@ -27,7 +27,7 @@ public sealed class FormattedImage : IDisposable
         /// </summary>
         /// <param name="image">The image.</param>
         /// <param name="format">The format.</param>
-        internal FormattedImage(Image<Rgba32> image, IImageFormat format)
+        internal FormattedImage(Image image, IImageFormat format)
         {
             this.Image = image;
             this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
@@ -35,9 +35,9 @@ internal FormattedImage(Image<Rgba32> image, IImageFormat format)
         }
 
         /// <summary>
-        /// Gets the image.
+        /// Gets the decoded image.
         /// </summary>
-        public Image<Rgba32> Image { get; private set; }
+        public Image Image { get; private set; }
 
         /// <summary>
         /// Gets or sets the format.
@@ -82,41 +82,36 @@ public IImageEncoder Encoder
         }
 
         /// <summary>
-        /// Loads the specified source.
+        /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
         /// </summary>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="configuration">The configuration.</param>
         /// <param name="source">The source.</param>
-        /// <returns>The <see cref="FormattedImage"/>.</returns>
-        public static FormattedImage Load(Configuration configuration, Stream source)
+        /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
+        internal static async Task<FormattedImage> LoadAsync<TPixel>(Configuration configuration, Stream source)
+            where TPixel : unmanaged, IPixel<TPixel>
         {
-            var image = ImageSharp.Image.Load<Rgba32>(configuration, source, out IImageFormat format);
+            (Image<TPixel> image, IImageFormat format) = await Image.LoadWithFormatAsync<TPixel>(configuration, source);
             return new FormattedImage(image, format);
         }
 
         /// <summary>
-        /// Loads the specified source.
+        /// Create a new instance of the <see cref="FormattedImage"/> class from the given stream.
         /// </summary>
         /// <param name="configuration">The configuration.</param>
         /// <param name="source">The source.</param>
         /// <returns>A <see cref="Task{FormattedImage}"/> representing the asynchronous operation.</returns>
-        public static async Task<FormattedImage> LoadAsync(Configuration configuration, Stream source)
+        internal static async Task<FormattedImage> LoadAsync(Configuration configuration, Stream source)
         {
-            (Image<Rgba32> image, IImageFormat format) = await ImageSharp.Image.LoadWithFormatAsync<Rgba32>(configuration, source);
+            (Image image, IImageFormat format) = await Image.LoadWithFormatAsync(configuration, source);
             return new FormattedImage(image, format);
         }
 
         /// <summary>
-        /// Saves image to the specified destination stream.
-        /// </summary>
-        /// <param name="destination">The destination stream.</param>
-        public void Save(Stream destination) => this.Image.Save(destination, this.encoder);
-
-        /// <summary>
-        /// Saves image to the specified destination stream.
+        /// Saves the <see cref="FormattedImage"/> to the specified destination stream.
         /// </summary>
         /// <param name="destination">The destination stream.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public Task SaveAsync(Stream destination) => this.Image.SaveAsync(destination, this.encoder);
+        internal void Save(Stream destination) => this.Image.Save(destination, this.encoder);
 
         /// <summary>
         /// Gets the EXIF orientation metata for the <see cref="FormattedImage"/>.
diff --git a/src/ImageSharp.Web/ImageSharp.Web.csproj b/src/ImageSharp.Web/ImageSharp.Web.csproj
index c100b651..6fb325b6 100644
--- a/src/ImageSharp.Web/ImageSharp.Web.csproj
+++ b/src/ImageSharp.Web/ImageSharp.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <AssemblyTitle>SixLabors.ImageSharp.Web</AssemblyTitle>
@@ -44,8 +44,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
-    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
+    <PackageReference Include="SixLabors.ImageSharp"  Version="2.1.0" />
   </ItemGroup>
 
   <Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
diff --git a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
index bbb6db09..7fac00bc 100644
--- a/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
+++ b/src/ImageSharp.Web/Middleware/ImageSharpMiddleware.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.IO;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
@@ -334,19 +335,43 @@ private async Task ProcessRequestAsync(
                                 }
                                 else
                                 {
-                                    using FormattedImage image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
-
-                                    image.Process(
-                                        this.logger,
-                                        this.processors,
-                                        commands,
-                                        this.commandParser,
-                                        this.parserCulture);
-
-                                    await this.options.OnBeforeSaveAsync.Invoke(image);
-
-                                    image.Save(outStream);
-                                    format = image.Format;
+                                    FormattedImage image = null;
+                                    try
+                                    {
+                                        // Now we can finally process the image.
+                                        // We first sort the processor collection by command order then use that collection to determine whether the decoded image pixel format
+                                        // explicitly requires an alpha component in order to allow correct processing.
+                                        //
+                                        // The non-generic variant will decode to the correct pixel format based upon the encoded image metadata which can yield
+                                        // massive memory savings.
+                                        IReadOnlyList<(int Index, IImageWebProcessor Processor)> sortedProcessors = this.processors.OrderBySupportedCommands(commands);
+                                        bool requiresAlpha = sortedProcessors.RequiresTrueColorPixelFormat(commands, this.commandParser, this.parserCulture);
+
+                                        if (requiresAlpha)
+                                        {
+                                            image = await FormattedImage.LoadAsync<Rgba32>(this.options.Configuration, inStream);
+                                        }
+                                        else
+                                        {
+                                            image = await FormattedImage.LoadAsync(this.options.Configuration, inStream);
+                                        }
+
+                                        image.Process(
+                                            this.logger,
+                                            sortedProcessors,
+                                            commands,
+                                            this.commandParser,
+                                            this.parserCulture);
+
+                                        await this.options.OnBeforeSaveAsync.Invoke(image);
+
+                                        image.Save(outStream);
+                                        format = image.Format;
+                                    }
+                                    finally
+                                    {
+                                        image?.Dispose();
+                                    }
                                 }
                             }
 
diff --git a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
index bc596943..bdb505da 100644
--- a/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
@@ -45,5 +45,8 @@ public FormattedImage Process(
 
             return image;
         }
+
+        /// <inheritdoc/>
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => true;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
index a9036533..f984c746 100644
--- a/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/FormatWebProcessor.cs
@@ -64,5 +64,8 @@ public FormattedImage Process(
 
             return image;
         }
+
+        /// <inheritdoc/>
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
index 2393de24..b653e12f 100644
--- a/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/IImageWebProcessor.cs
@@ -35,5 +35,20 @@ FormattedImage Process(
             CommandCollection commands,
             CommandParser parser,
             CultureInfo culture);
+
+        /// <summary>
+        /// <para>
+        /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
+        /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
+        /// </para>
+        /// <para>This method is used to determine whether optimizations can be enabled to reduce memory consumption during processing.</para>
+        /// </summary>
+        /// <param name="commands">The ordered collection containing the processing commands.</param>
+        /// <param name="parser">The command parser use for parting commands.</param>
+        /// <param name="culture">
+        /// The <see cref="CultureInfo"/> to use as the current parsing culture.
+        /// </param>
+        /// <returns>The <see cref="bool"/> indicating whether a 32 bit True Color pixel format is required.</returns>
+        bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture);
     }
 }
diff --git a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
index 7b91d97a..2cde708b 100644
--- a/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/QualityWebProcessor.cs
@@ -82,5 +82,8 @@ public FormattedImage Process(
 
             return image;
         }
+
+        /// <inheritdoc/>
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
index 7be7b82d..4a8f10e6 100644
--- a/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
+++ b/src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
@@ -47,6 +47,11 @@ public class ResizeWebProcessor : IImageWebProcessor
         /// </summary>
         public const string Anchor = "ranchor";
 
+        /// <summary>
+        /// The command constant for the resize padding background color.
+        /// </summary>
+        public const string Color = "rcolor";
+
         /// <summary>
         /// The command constant for the resize orientation handling mode.
         /// </summary>
@@ -67,7 +72,8 @@ private static readonly IEnumerable<string> ResizeCommands
                 Sampler,
                 Anchor,
                 Compand,
-                Orient
+                Orient,
+                Color
             };
 
         /// <inheritdoc/>
@@ -132,10 +138,18 @@ internal static ResizeOptions GetResizeOptions(
 
             // Defaults to Bicubic if not set.
             options.Sampler = GetSampler(commands);
+            options.PadColor = parser.ParseValue<Color>(commands.GetValueOrDefault(Color), culture);
 
             return options;
         }
 
+        /// <inheritdoc/>
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture)
+        {
+            ResizeMode mode = parser.ParseValue<ResizeMode>(commands.GetValueOrDefault(Mode), culture);
+            return mode is ResizeMode.Pad or ResizeMode.BoxPad;
+        }
+
         private static Size ParseSize(
             ushort orientation,
             CommandCollection commands,
diff --git a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
index 5b402b3a..ad6136f5 100644
--- a/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
+++ b/src/ImageSharp.Web/Processors/WebProcessingExtensions.cs
@@ -21,7 +21,7 @@ internal static class WebProcessingExtensions
         /// <param name="logger">The type used for performing logging.</param>
         /// <param name="processors">The collection of available processors.</param>
         /// <param name="commands">The parsed collection of processing commands.</param>
-        /// <param name="commandParser">The command parser use for parting commands.</param>
+        /// <param name="parser">The command parser use for parting commands.</param>
         /// <param name="culture">
         /// The <see cref="CultureInfo"/> to use as the current parsing culture.
         /// </param>
@@ -29,14 +29,14 @@ internal static class WebProcessingExtensions
         public static FormattedImage Process(
             this FormattedImage source,
             ILogger logger,
-            IEnumerable<IImageWebProcessor> processors,
+            IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
             CommandCollection commands,
-            CommandParser commandParser,
+            CommandParser parser,
             CultureInfo culture)
         {
-            foreach (IImageWebProcessor processor in processors.GetBySupportedCommands(commands))
+            foreach ((int Index, IImageWebProcessor Processor) processor in processors)
             {
-                source = processor.Process(source, logger, commands, commandParser, culture);
+                source = processor.Processor.Process(source, logger, commands, parser, culture);
             }
 
             return source;
@@ -50,10 +50,9 @@ public static FormattedImage Process(
         /// <returns>
         /// The sorted proccessors that supports any of the specified commands.
         /// </returns>
-        public static IEnumerable<IImageWebProcessor> GetBySupportedCommands(this IEnumerable<IImageWebProcessor> processors, CommandCollection commands)
+        public static IReadOnlyList<(int Index, IImageWebProcessor Processor)> OrderBySupportedCommands(this IEnumerable<IImageWebProcessor> processors, CommandCollection commands)
         {
-            var indexedProcessors = new List<(int Index, IImageWebProcessor Processor)>();
-
+            List<(int Index, IImageWebProcessor Processor)> indexedProcessors = new();
             foreach (IImageWebProcessor processor in processors)
             {
                 // Get index of first supported command
@@ -65,12 +64,7 @@ public static IEnumerable<IImageWebProcessor> GetBySupportedCommands(this IEnume
             }
 
             indexedProcessors.Sort((x, y) => x.Index.CompareTo(y.Index));
-
-            // Return sorted processors
-            foreach ((int _, IImageWebProcessor processor) in indexedProcessors)
-            {
-                yield return processor;
-            }
+            return indexedProcessors;
         }
 
         /// <summary>
@@ -93,5 +87,34 @@ public static bool IsSupportedCommand(this IImageWebProcessor processor, string
 
             return false;
         }
+
+        /// <summary>
+        /// <para>
+        /// Returns a value indicating whether the image to be processed should be decoded using a 32 bit True Color pixel format - 8 bits per color component
+        /// plus an 8 bit alpha channel <see href="https://en.wikipedia.org/wiki/Color_depth#True_color_(24-bit)"/>.
+        /// </para>
+        /// <para>This method is used to determine whether optimizations can be enabled to reduce memory consumption during processing.</para>
+        /// </summary>
+        /// <param name="processors">The collection of ordered processors.</param>
+        /// <param name="commands">The ordered collection containing the processing commands.</param>
+        /// <param name="parser">The command parser use for parting commands.</param>
+        /// <param name="culture">
+        /// The <see cref="CultureInfo"/> to use as the current parsing culture.
+        /// </param>
+        /// <returns>The <see cref="bool"/> indicating whether a 32 bit True Color pixel format is required.</returns>
+        public static bool RequiresTrueColorPixelFormat(
+            this IReadOnlyList<(int Index, IImageWebProcessor Processor)> processors,
+            CommandCollection commands,
+            CommandParser parser,
+            CultureInfo culture)
+        {
+            bool requiresAlpha = false;
+            foreach ((int Index, IImageWebProcessor Processor) processor in processors)
+            {
+                requiresAlpha |= processor.Processor.RequiresTrueColorPixelFormat(commands, parser, culture);
+            }
+
+            return requiresAlpha;
+        }
     }
 }
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index ed77866f..29fe32a8 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -18,11 +18,7 @@
 
   <!-- Test Dependencies -->
   <ItemGroup>
-    <PackageReference Update="Azure.Storage.Blobs" Version="12.10.0" />
     <PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Update="Microsoft.Azure.KeyVault.Core" Version="3.0.4" />
-    <PackageReference Update="Microsoft.Azure.Storage.Blob" Version="11.1.2" />
 
     <!--
         Don't update these. We're getting AmbiguousMatchException for
diff --git a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
index 9279d2a3..bebb71f6 100644
--- a/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
+++ b/tests/ImageSharp.Web.Benchmarks/ImageSharp.Web.Benchmarks.csproj
@@ -12,6 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet"/>
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.Http"/>
   </ItemGroup>
 
diff --git a/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs b/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
index b047e178..555b2c36 100644
--- a/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
+++ b/tests/ImageSharp.Web.Tests/DependencyInjection/MockWebProcessor.cs
@@ -21,5 +21,7 @@ public FormattedImage Process(
             CommandParser parser,
             CultureInfo culture)
             => image;
+
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
index 36278252..894ce830 100644
--- a/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
+++ b/tests/ImageSharp.Web.Tests/ImageSharp.Web.Tests.csproj
@@ -6,10 +6,6 @@
     <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
@@ -20,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="SubFolder\imagesharp-logo.png">
+    <None Update="SubFolder\sixlabors.imagesharp.web.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="xunit.runner.json">
diff --git a/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
index 08f24bf0..8d1d9611 100644
--- a/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/AWSS3StorageCacheServerTests.cs
@@ -1,124 +1,16 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
-using Xunit;
+using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Web.Tests.Processing
 {
     public class AWSS3StorageCacheServerTests : ServerTestBase<AWSS3StorageCacheTestServerFixture>
     {
-        private const int Width = 20;
-        private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
-        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
-
-        public AWSS3StorageCacheServerTests(AWSS3StorageCacheTestServerFixture fixture)
-            : base(fixture)
-        {
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessAndResolveImageAsync(string url)
-        {
-            string ext = Path.GetExtension(url);
-            IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
-
-            // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image image = actual.Image;
-
-            Assert.Equal(Width, image.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // Cached Response
-            response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image cached = cachedActual.Image;
-
-            Assert.Equal(Width, cached.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // 304 response
-            var request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            request.Dispose();
-            response.Dispose();
-
-            // 412 response
-            request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-
-            request.Dispose();
-            response.Dispose();
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessMultipleIdenticalQueriesAsync(string url)
+        public AWSS3StorageCacheServerTests(AWSS3StorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+            : base(fixture, outputHelper, TestConstants.AWSTestImage)
         {
-            Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
-            {
-                string command = i % 2 == 0 ? Command : Command2;
-                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
-                Assert.NotNull(response);
-                Assert.True(response.IsSuccessStatusCode);
-                Assert.True(response.Content.Headers.ContentLength > 0);
-            })).ToArray();
-
-            var all = Task.WhenAll(tasks);
-            await all;
-            Assert.True(all.IsCompletedSuccessfully);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
index f5af8ebb..130f6c27 100644
--- a/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/AzureBlobStorageCacheServerTests.cs
@@ -1,124 +1,16 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
-using Xunit;
+using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Web.Tests.Processing
 {
     public class AzureBlobStorageCacheServerTests : ServerTestBase<AzureBlobStorageCacheTestServerFixture>
     {
-        private const int Width = 20;
-        private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
-        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
-
-        public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture fixture)
-            : base(fixture)
-        {
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessAndResolveImageAsync(string url)
-        {
-            string ext = Path.GetExtension(url);
-            IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
-
-            // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image image = actual.Image;
-
-            Assert.Equal(Width, image.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // Cached Response
-            response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image cached = cachedActual.Image;
-
-            Assert.Equal(Width, cached.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // 304 response
-            var request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            request.Dispose();
-            response.Dispose();
-
-            // 412 response
-            request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-
-            request.Dispose();
-            response.Dispose();
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessMultipleIdenticalQueriesAsync(string url)
+        public AzureBlobStorageCacheServerTests(AzureBlobStorageCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+            : base(fixture, outputHelper, TestConstants.AzureTestImage)
         {
-            Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
-            {
-                string command = i % 2 == 0 ? Command : Command2;
-                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
-                Assert.NotNull(response);
-                Assert.True(response.IsSuccessStatusCode);
-                Assert.True(response.Content.Headers.ContentLength > 0);
-            })).ToArray();
-
-            var all = Task.WhenAll(tasks);
-            await all;
-            Assert.True(all.IsCompletedSuccessfully);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
index 8cfee080..af71741c 100644
--- a/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processing/PhysicalFileSystemCacheServerTests.cs
@@ -1,124 +1,16 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Web.Tests.TestUtilities;
-using Xunit;
+using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Web.Tests.Processing
 {
     public class PhysicalFileSystemCacheServerTests : ServerTestBase<PhysicalFileSystemCacheTestServerFixture>
     {
-        private const int Width = 20;
-        private static readonly string Command = "?invalidcommand=qwerty&width=" + Width + "&v=" + Guid.NewGuid().ToString();
-        private static readonly string Command2 = "?invalidcommand=qwerty&width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
-
-        public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixture fixture)
-            : base(fixture)
-        {
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessAndResolveImageAsync(string url)
-        {
-            string ext = Path.GetExtension(url);
-            IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
-
-            // First response
-            HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image image = actual.Image;
-
-            Assert.Equal(Width, image.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // Cached Response
-            response = await this.HttpClient.GetAsync(url + Command);
-
-            Assert.NotNull(response);
-            Assert.True(response.IsSuccessStatusCode);
-            Assert.True(response.Content.Headers.ContentLength > 0);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
-            using Image cached = cachedActual.Image;
-
-            Assert.Equal(Width, cached.Width);
-            Assert.Equal(format, actual.Format);
-
-            response.Dispose();
-
-            // 304 response
-            var request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
-
-            request.Dispose();
-            response.Dispose();
-
-            // 412 response
-            request = new HttpRequestMessage
-            {
-                RequestUri = new Uri(url + Command),
-                Method = HttpMethod.Get,
-            };
-
-            request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
-
-            response = await this.HttpClient.SendAsync(request);
-
-            Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
-            Assert.Equal(0, response.Content.Headers.ContentLength);
-
-            request.Dispose();
-            response.Dispose();
-        }
-
-        [Theory]
-        [InlineData(TestConstants.PhysicalTestImage)]
-        [InlineData(TestConstants.AzureTestImage)]
-        [InlineData(TestConstants.AWSTestImage)]
-        public async Task CanProcessMultipleIdenticalQueriesAsync(string url)
+        public PhysicalFileSystemCacheServerTests(PhysicalFileSystemCacheTestServerFixture fixture, ITestOutputHelper outputHelper)
+            : base(fixture, outputHelper, TestConstants.PhysicalTestImage)
         {
-            Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
-              {
-                  string command = i % 2 == 0 ? Command : Command2;
-                  using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
-                  Assert.NotNull(response);
-                  Assert.True(response.IsSuccessStatusCode);
-                  Assert.True(response.Content.Headers.ContentLength > 0);
-              })).ToArray();
-
-            var all = Task.WhenAll(tasks);
-            await all;
-            Assert.True(all.IsCompletedSuccessfully);
         }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
index 5dfee886..c72aed12 100644
--- a/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs
@@ -32,5 +32,23 @@ public void BackgroundColorWebProcessor_UpdatesColor()
 
             Assert.True(Color.Orange.Equals(image[0, 0]));
         }
+
+        [Theory]
+        [InlineData(nameof(Color.Orange))]
+        [InlineData(nameof(Color.Black))]
+        [InlineData(nameof(Color.Blue))]
+        [InlineData(nameof(Color.RebeccaPurple))]
+        public void BackgroundColorWebProcessor_CanReportAlphaRequirements(string color)
+        {
+            CommandParser parser = new(new[] { new ColorConverter() });
+            CultureInfo culture = CultureInfo.InvariantCulture;
+
+            CommandCollection commands = new()
+            {
+                { new(BackgroundColorWebProcessor.Color, color) }
+            };
+
+            Assert.True(new BackgroundColorWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
index 1baaa626..45c87af5 100644
--- a/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs
@@ -2,10 +2,14 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.Formats.Gif;
+using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Formats.Webp;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Commands.Converters;
@@ -17,6 +21,16 @@ namespace SixLabors.ImageSharp.Web.Tests.Processors
 {
     public class FormatWebProcessorTests
     {
+        public static TheoryData<string> FormatNameData { get; }
+            = new TheoryData<string>
+            {
+                { BmpFormat.Instance.Name },
+                { GifFormat.Instance.Name },
+                { PngFormat.Instance.Name },
+                { JpegFormat.Instance.Name },
+                { WebpFormat.Instance.Name },
+            };
+
         [Fact]
         public void FormatWebProcessor_UpdatesFormat()
         {
@@ -37,5 +51,21 @@ public void FormatWebProcessor_UpdatesFormat()
 
             Assert.Equal(formatted.Format, GifFormat.Instance);
         }
+
+        [Theory]
+        [MemberData(nameof(FormatNameData))]
+        public void FormatWebProcessor_CanReportAlphaRequirements(string format)
+        {
+            CommandParser parser = new(Array.Empty<ICommandConverter>());
+            CultureInfo culture = CultureInfo.InvariantCulture;
+
+            CommandCollection commands = new()
+            {
+                { new(FormatWebProcessor.Format, format) },
+            };
+
+            FormatWebProcessor processor = new(Options.Create(new ImageSharpMiddlewareOptions()));
+            Assert.False(processor.RequiresTrueColorPixelFormat(commands, parser, culture));
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
index 8df3c827..853b18ad 100644
--- a/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/QualityWebProcessorTests.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using SixLabors.ImageSharp.Formats.Jpeg;
@@ -15,6 +16,8 @@ namespace SixLabors.ImageSharp.Web.Tests.Processors
 {
     public class QualityWebProcessorTests
     {
+        private readonly Random random = new();
+
         [Fact]
         public void QualityWebProcessor_UpdatesJpegQuality()
         {
@@ -63,5 +66,24 @@ public void QualityWebProcessor_UpdatesWebpQuality()
             Assert.Equal(42, ((WebpEncoder)formatted.Encoder).Quality);
             Assert.Equal(WebpFileFormatType.Lossy, ((WebpEncoder)formatted.Encoder).FileFormat);
         }
+
+        [Fact]
+        public void QualityWebProcessor_CanReportAlphaRequirements()
+        {
+            var converters = new List<ICommandConverter>
+            {
+                new IntegralNumberConverter<int>(),
+            };
+
+            var parser = new CommandParser(converters);
+            CultureInfo culture = CultureInfo.InvariantCulture;
+
+            CommandCollection commands = new()
+            {
+                { new(QualityWebProcessor.Quality, this.random.Next(1, 100).ToString()) },
+            };
+
+            Assert.False(new QualityWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs b/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
index 6a1bf34a..f8743f03 100644
--- a/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs
@@ -45,7 +45,8 @@ public void ResizeWebProcessor_UpdatesSize(string resampler)
                 new ArrayConverter<float>(),
                 new EnumConverter(),
                 new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>()
+                new SimpleCommandConverter<float>(),
+                new ColorConverter()
             };
 
             var parser = new CommandParser(converters);
@@ -91,7 +92,8 @@ public void ResizeWebProcessor_RespectsOrientation_Size(ushort orientation, bool
                 new ArrayConverter<float>(),
                 new EnumConverter(),
                 new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>()
+                new SimpleCommandConverter<float>(),
+                new ColorConverter()
             };
 
             var parser = new CommandParser(converters);
@@ -146,7 +148,8 @@ public void ResizeWebProcessor_RespectsOrientation_Center(ushort orientation)
                 new ArrayConverter<float>(),
                 new EnumConverter(),
                 new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>()
+                new SimpleCommandConverter<float>(),
+                new ColorConverter()
             };
 
             var parser = new CommandParser(converters);
@@ -188,7 +191,8 @@ public void ResizeWebProcessor_RespectsOrientation_Anchor(ushort orientation)
                 new ArrayConverter<float>(),
                 new EnumConverter(),
                 new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>()
+                new SimpleCommandConverter<float>(),
+                new ColorConverter()
             };
 
             var parser = new CommandParser(converters);
@@ -236,7 +240,8 @@ public void ResizeWebProcessor_CanIgnoreOrientation(ushort orientation)
                 new ArrayConverter<float>(),
                 new EnumConverter(),
                 new SimpleCommandConverter<bool>(),
-                new SimpleCommandConverter<float>()
+                new SimpleCommandConverter<float>(),
+                new ColorConverter()
             };
 
             var parser = new CommandParser(converters);
@@ -261,6 +266,32 @@ public void ResizeWebProcessor_CanIgnoreOrientation(ushort orientation)
             Assert.Equal(height, image.Height);
         }
 
+        [Theory]
+        [InlineData(ResizeMode.Crop, false)]
+        [InlineData(ResizeMode.Pad, true)]
+        [InlineData(ResizeMode.BoxPad, true)]
+        [InlineData(ResizeMode.Max, false)]
+        [InlineData(ResizeMode.Min, false)]
+        [InlineData(ResizeMode.Stretch, false)]
+        [InlineData(ResizeMode.Manual, false)]
+        public void ResizeWebProcessor_CanReportAlphaRequirements(ResizeMode resizeMode, bool requiresAlpha)
+        {
+            var converters = new List<ICommandConverter>
+            {
+                new EnumConverter(),
+            };
+
+            var parser = new CommandParser(converters);
+            CultureInfo culture = CultureInfo.InvariantCulture;
+
+            CommandCollection commands = new()
+            {
+                { new(ResizeWebProcessor.Mode, resizeMode.ToString()) },
+            };
+
+            Assert.Equal(requiresAlpha, new ResizeWebProcessor().RequiresTrueColorPixelFormat(commands, parser, culture));
+        }
+
         private static PointF GetExpectedCenter(ushort orientation, PointF center)
         {
             // New XY is calculated based on flipping and rotating the input XY.
diff --git a/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs b/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
index 7a0af5a5..b6f86d78 100644
--- a/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
+++ b/tests/ImageSharp.Web.Tests/Processors/WebProcessingExtensionsTests.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System.Linq;
+using System.Collections.Generic;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Tests.DependencyInjection;
@@ -29,11 +29,11 @@ public void WebProcessingExtensions_GetBySupportedCommands()
                 new(ResizeWebProcessor.Height, null)
             };
 
-            IImageWebProcessor[] supportedProcessors = processors.GetBySupportedCommands(commands).ToArray();
+            IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
 
-            Assert.Equal(2, supportedProcessors.Length);
-            Assert.IsType<ResizeWebProcessor>(supportedProcessors[0]);
-            Assert.IsType<QualityWebProcessor>(supportedProcessors[1]);
+            Assert.Equal(2, supportedProcessors.Count);
+            Assert.IsType<ResizeWebProcessor>(supportedProcessors[0].Processor);
+            Assert.IsType<QualityWebProcessor>(supportedProcessors[1].Processor);
         }
 
         [Fact]
@@ -46,7 +46,7 @@ public void WebProcessingExtensions_GetBySupportedCommands_Empty()
 
             CommandCollection commands = new();
 
-            IImageWebProcessor[] supportedProcessors = processors.GetBySupportedCommands(commands).ToArray();
+            IReadOnlyList<(int Index, IImageWebProcessor Processor)> supportedProcessors = processors.OrderBySupportedCommands(commands);
 
             Assert.Empty(supportedProcessors);
         }
diff --git a/tests/ImageSharp.Web.Tests/SubFolder/imagesharp-logo.png b/tests/ImageSharp.Web.Tests/SubFolder/imagesharp-logo.png
deleted file mode 100644
index 0b661ed7..00000000
--- a/tests/ImageSharp.Web.Tests/SubFolder/imagesharp-logo.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e0e61e92427f3686cf4558193c077ab0ec78b5c869e90445147c0c67d66ce10
-size 25255
diff --git a/tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png b/tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png
new file mode 100644
index 00000000..d60a4f9c
--- /dev/null
+++ b/tests/ImageSharp.Web.Tests/SubFolder/sixlabors.imagesharp.web.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e320603ed2376bf6c79180b0e611b08a1c11c4b68856327023ef4af323a55628
+size 18945
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
index c1e94de5..b6c4adf8 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs
@@ -1,82 +1,21 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Threading.Tasks;
 using Amazon.S3;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching.AWS;
 using SixLabors.ImageSharp.Web.DependencyInjection;
-using SixLabors.ImageSharp.Web.Middleware;
-using SixLabors.ImageSharp.Web.Providers;
 using SixLabors.ImageSharp.Web.Providers.AWS;
-using SixLabors.ImageSharp.Web.Providers.Azure;
-using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
     public class AWSS3StorageCacheTestServerFixture : TestServerFixture
     {
-        protected override void ConfigureServices(IServiceCollection services) =>
-            services.AddImageSharp(options =>
-                {
-                    Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
-
-                    options.OnParseCommandsAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.Parser);
-
-                        return onParseCommandsAsync.Invoke(context);
-                    };
-
-                    Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
-
-                    options.OnProcessedAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.ContentType);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Extension);
-                        Assert.NotNull(context.Stream);
-
-                        return onProcessedAsync.Invoke(context);
-                    };
-
-                    Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
-
-                    options.OnBeforeSaveAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Format);
-                        Assert.NotNull(context.Encoder);
-                        Assert.NotNull(context.Image);
-
-                        return onBeforeSaveAsync.Invoke(context);
-                    };
-
-                    Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
-
-                    options.OnPrepareResponseAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Response);
-
-                        return onPrepareResponseAsync.Invoke(context);
-                    };
-                })
-                .ClearProviders()
-                .Configure<AzureBlobStorageImageProviderOptions>(options => options.BlobContainers.Add(new AzureBlobContainerClientOptions
-                {
-                    ConnectionString = TestConstants.AzureConnectionString,
-                    ContainerName = TestConstants.AzureContainerName
-                }))
-                .Configure<AWSS3StorageImageProviderOptions>(options => options.S3Buckets.Add(new AWSS3BucketClientOptions
+        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+            => builder
+            .Configure<AWSS3StorageImageProviderOptions>(o =>
+                o.S3Buckets.Add(
+                new AWSS3BucketClientOptions
                 {
                     Endpoint = TestConstants.AWSEndpoint,
                     BucketName = TestConstants.AWSBucketName,
@@ -84,22 +23,17 @@ protected override void ConfigureServices(IServiceCollection services) =>
                     AccessSecret = TestConstants.AWSAccessSecret,
                     Region = TestConstants.AWSRegion
                 }))
-                .AddProvider(AzureBlobStorageImageProviderFactory.Create)
-                .AddProvider(AWSS3StorageImageProviderFactory.Create)
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<CacheBusterWebProcessor>()
-                .Configure<AWSS3StorageCacheOptions>(options =>
-                {
-                    options.Endpoint = TestConstants.AWSEndpoint;
-                    options.BucketName = TestConstants.AWSCacheBucketName;
-                    options.AccessKey = TestConstants.AWSAccessKey;
-                    options.AccessSecret = TestConstants.AWSAccessSecret;
-                    options.Region = TestConstants.AWSRegion;
-
-                    AWSS3StorageCache.CreateIfNotExists(options, S3CannedACL.Private);
-                })
-                .SetCache<AWSS3StorageCache>();
-
-        protected override void Configure(IApplicationBuilder app) => app.UseImageSharp();
+            .AddProvider(AWSS3StorageImageProviderFactory.Create)
+            .Configure<AWSS3StorageCacheOptions>(o =>
+            {
+                o.Endpoint = TestConstants.AWSEndpoint;
+                o.BucketName = TestConstants.AWSCacheBucketName;
+                o.AccessKey = TestConstants.AWSAccessKey;
+                o.AccessSecret = TestConstants.AWSAccessSecret;
+                o.Region = TestConstants.AWSRegion;
+
+                AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
+            })
+            .SetCache<AWSS3StorageCache>();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
index 5a3b64b1..736b9fcd 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageImageProviderFactory.cs
@@ -91,7 +91,7 @@ private static async Task InitializeAWSStorageAsync(IServiceProvider services, A
                 IFileInfo file = environment.WebRootFileProvider.GetFileInfo(TestConstants.ImagePath);
                 using Stream stream = file.CreateReadStream();
 
-                // Set the max-age property so we get coverage for testing is in our AWS provider.
+                // Set the max-age property so we get coverage for testing in our AWS provider.
                 var cacheControl = new CacheControlHeaderValue
                 {
                     Public = true,
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
index ee89d29e..ac461848 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/AzureBlobStorageCacheTestServerFixture.cs
@@ -1,102 +1,33 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Threading.Tasks;
 using Azure.Storage.Blobs.Models;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching.Azure;
 using SixLabors.ImageSharp.Web.DependencyInjection;
-using SixLabors.ImageSharp.Web.Middleware;
-using SixLabors.ImageSharp.Web.Providers;
-using SixLabors.ImageSharp.Web.Providers.AWS;
 using SixLabors.ImageSharp.Web.Providers.Azure;
-using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
     public class AzureBlobStorageCacheTestServerFixture : TestServerFixture
     {
-        protected override void ConfigureServices(IServiceCollection services) =>
-            services.AddImageSharp(options =>
-                {
-                    Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
-
-                    options.OnParseCommandsAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.Parser);
-
-                        return onParseCommandsAsync.Invoke(context);
-                    };
-
-                    Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
-
-                    options.OnProcessedAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.ContentType);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Extension);
-                        Assert.NotNull(context.Stream);
-
-                        return onProcessedAsync.Invoke(context);
-                    };
-
-                    Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
-
-                    options.OnBeforeSaveAsync = context =>
+        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+            => builder
+               .Configure<AzureBlobStorageImageProviderOptions>(o =>
+                    o.BlobContainers.Add(
+                    new AzureBlobContainerClientOptions
                     {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Format);
-                        Assert.NotNull(context.Encoder);
-                        Assert.NotNull(context.Image);
-
-                        return onBeforeSaveAsync.Invoke(context);
-                    };
-
-                    Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
-
-                    options.OnPrepareResponseAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Response);
-
-                        return onPrepareResponseAsync.Invoke(context);
-                    };
-                })
-                .ClearProviders()
-                .Configure<AzureBlobStorageImageProviderOptions>(options => options.BlobContainers.Add(new AzureBlobContainerClientOptions
-                {
-                    ConnectionString = TestConstants.AzureConnectionString,
-                    ContainerName = TestConstants.AzureContainerName
-                }))
-                .Configure<AWSS3StorageImageProviderOptions>(options => options.S3Buckets.Add(new AWSS3BucketClientOptions
-                {
-                    Endpoint = TestConstants.AWSEndpoint,
-                    BucketName = TestConstants.AWSBucketName,
-                    AccessKey = TestConstants.AWSAccessKey,
-                    AccessSecret = TestConstants.AWSAccessSecret,
-                    Region = TestConstants.AWSRegion
-                }))
+                        ConnectionString = TestConstants.AzureConnectionString,
+                        ContainerName = TestConstants.AzureContainerName
+                    }))
                 .AddProvider(AzureBlobStorageImageProviderFactory.Create)
-                .AddProvider(AWSS3StorageImageProviderFactory.Create)
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<CacheBusterWebProcessor>()
-                .Configure<AzureBlobStorageCacheOptions>(options =>
+                .Configure<AzureBlobStorageCacheOptions>(o =>
                 {
-                    options.ConnectionString = TestConstants.AzureConnectionString;
-                    options.ContainerName = TestConstants.AzureCacheContainerName;
+                    o.ConnectionString = TestConstants.AzureConnectionString;
+                    o.ContainerName = TestConstants.AzureCacheContainerName;
 
-                    AzureBlobStorageCache.CreateIfNotExists(options, PublicAccessType.None);
+                    AzureBlobStorageCache.CreateIfNotExists(o, PublicAccessType.None);
                 })
                 .SetCache<AzureBlobStorageCache>();
-
-        protected override void Configure(IApplicationBuilder app) => app.UseImageSharp();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs b/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
index ac263fde..d0fb9af3 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/CacheBusterWebProcessor.cs
@@ -22,5 +22,7 @@ public FormattedImage Process(
             CommandParser parser,
             CultureInfo culture)
             => image;
+
+        public bool RequiresTrueColorPixelFormat(CommandCollection commands, CommandParser parser, CultureInfo culture) => false;
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
index 02d044d7..8926cd9a 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/PhysicalFileSystemCacheTestServerFixture.cs
@@ -1,92 +1,18 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.DependencyInjection;
-using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Providers;
-using SixLabors.ImageSharp.Web.Providers.AWS;
-using SixLabors.ImageSharp.Web.Providers.Azure;
-using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
     public class PhysicalFileSystemCacheTestServerFixture : TestServerFixture
     {
-        protected override void ConfigureServices(IServiceCollection services) =>
-            services.AddImageSharp(options =>
-                {
-                    Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
-
-                    options.OnParseCommandsAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.Parser);
-
-                        return onParseCommandsAsync.Invoke(context);
-                    };
-
-                    Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
-
-                    options.OnProcessedAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Commands);
-                        Assert.NotNull(context.ContentType);
-                        Assert.NotNull(context.Context);
-                        Assert.NotNull(context.Extension);
-                        Assert.NotNull(context.Stream);
-
-                        return onProcessedAsync.Invoke(context);
-                    };
-
-                    Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
-
-                    options.OnBeforeSaveAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Format);
-                        Assert.NotNull(context.Encoder);
-                        Assert.NotNull(context.Image);
-
-                        return onBeforeSaveAsync.Invoke(context);
-                    };
-
-                    Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
-
-                    options.OnPrepareResponseAsync = context =>
-                    {
-                        Assert.NotNull(context);
-                        Assert.NotNull(context.Response);
-
-                        return onPrepareResponseAsync.Invoke(context);
-                    };
-                })
-                .ClearProviders()
-                .Configure<AzureBlobStorageImageProviderOptions>(options => options.BlobContainers.Add(new AzureBlobContainerClientOptions
-                {
-                    ConnectionString = TestConstants.AzureConnectionString,
-                    ContainerName = TestConstants.AzureContainerName
-                }))
-                .Configure<AWSS3StorageImageProviderOptions>(options => options.S3Buckets.Add(new AWSS3BucketClientOptions
-                {
-                    Endpoint = TestConstants.AWSEndpoint,
-                    BucketName = TestConstants.AWSBucketName,
-                    AccessKey = TestConstants.AWSAccessKey,
-                    AccessSecret = TestConstants.AWSAccessSecret,
-                    Region = TestConstants.AWSRegion
-                }))
-                .AddProvider(AzureBlobStorageImageProviderFactory.Create)
-                .AddProvider(AWSS3StorageImageProviderFactory.Create)
-                .AddProvider<PhysicalFileSystemProvider>()
-                .AddProcessor<CacheBusterWebProcessor>();
-
-        protected override void Configure(IApplicationBuilder app) => app.UseImageSharp();
+        protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
+            => builder
+            .AddProvider<PhysicalFileSystemProvider>()
+            .SetCache<PhysicalFileSystemCache>();
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
index 98f265fd..45a145fb 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs
@@ -1,19 +1,143 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+using System.Collections;
+using System.IO;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
+using System.Threading.Tasks;
+using SixLabors.ImageSharp.Formats;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
     public abstract class ServerTestBase<TFixture> : IClassFixture<TFixture>
         where TFixture : TestServerFixture
     {
-        protected ServerTestBase(TFixture fixture)
+        private const int Width = 20;
+        private static readonly string Command = "?width=" + Width + "&v=" + Guid.NewGuid().ToString();
+        private static readonly string Command2 = "?width=" + (Width + 1) + "&v=" + Guid.NewGuid().ToString();
+
+        protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, string imageSource)
         {
             this.HttpClient = fixture.HttpClient;
+            this.OutputHelper = outputHelper;
+            this.ImageSource = imageSource;
+
+            this.OutputHelper.WriteLine("EnvironmentalVariables");
+            foreach (DictionaryEntry item in Environment.GetEnvironmentVariables())
+            {
+                this.OutputHelper.WriteLine($"Key = {item.Key}, Value = {item.Value}");
+            }
         }
 
         public HttpClient HttpClient { get; }
+
+        public ITestOutputHelper OutputHelper { get; }
+
+        public string ImageSource { get; }
+
+        [Fact]
+        public async Task CanProcessAndResolveImageAsync()
+        {
+            string url = this.ImageSource;
+
+            string ext = Path.GetExtension(url);
+            IImageFormat format = Configuration.Default.ImageFormatsManager.FindFormatByFileExtension(ext);
+
+            // First response
+            HttpResponseMessage response = await this.HttpClient.GetAsync(url + Command);
+
+            Assert.NotNull(response);
+            Assert.True(response.IsSuccessStatusCode);
+            Assert.True(response.Content.Headers.ContentLength > 0);
+            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+
+            (Image Image, IImageFormat Format) actual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
+            using Image image = actual.Image;
+
+            Assert.Equal(Width, image.Width);
+            Assert.Equal(format, actual.Format);
+
+            response.Dispose();
+
+            // Cached Response
+            response = await this.HttpClient.GetAsync(url + Command);
+
+            Assert.NotNull(response);
+            Assert.True(response.IsSuccessStatusCode);
+            Assert.True(response.Content.Headers.ContentLength > 0);
+            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+
+            (Image Image, IImageFormat Format) cachedActual = await Image.LoadWithFormatAsync(await response.Content.ReadAsStreamAsync());
+            using Image cached = cachedActual.Image;
+
+            Assert.Equal(Width, cached.Width);
+            Assert.Equal(format, actual.Format);
+
+            response.Dispose();
+
+            // 304 response
+            var request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(url + Command),
+                Method = HttpMethod.Get,
+            };
+
+            request.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
+
+            response = await this.HttpClient.SendAsync(request);
+
+            // This test is flaky in the CI environment.
+            if (!TestEnvironment.RunsOnCI)
+            {
+                Assert.Equal(HttpStatusCode.NotModified, response.StatusCode);
+                Assert.Equal(0, response.Content.Headers.ContentLength);
+            }
+
+            Assert.Equal(format.DefaultMimeType, response.Content.Headers.ContentType.MediaType);
+
+            request.Dispose();
+            response.Dispose();
+
+            // 412 response
+            request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(url + Command),
+                Method = HttpMethod.Get,
+            };
+
+            request.Headers.IfUnmodifiedSince = DateTimeOffset.MinValue;
+
+            response = await this.HttpClient.SendAsync(request);
+
+            Assert.Equal(HttpStatusCode.PreconditionFailed, response.StatusCode);
+            Assert.Equal(0, response.Content.Headers.ContentLength);
+
+            request.Dispose();
+            response.Dispose();
+        }
+
+        [Fact]
+        public async Task CanProcessMultipleIdenticalQueriesAsync()
+        {
+            string url = this.ImageSource;
+
+            Task[] tasks = Enumerable.Range(0, 100).Select(i => Task.Run(async () =>
+            {
+                string command = i % 2 == 0 ? Command : Command2;
+                using HttpResponseMessage response = await this.HttpClient.GetAsync(url + command);
+                Assert.NotNull(response);
+                Assert.True(response.IsSuccessStatusCode);
+                Assert.True(response.Content.Headers.ContentLength > 0);
+            })).ToArray();
+
+            var all = Task.WhenAll(tasks);
+            await all;
+            Assert.True(all.IsCompletedSuccessfully);
+        }
     }
 }
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
index c25cb6c2..3b3efa85 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs
@@ -14,7 +14,7 @@ public static class TestConstants
         public const string AWSCacheBucketName = "aws-cache";
         public const string AWSAccessKey = "";
         public const string AWSAccessSecret = "";
-        public const string ImagePath = "SubFolder/imagesharp-logo.png";
+        public const string ImagePath = "SubFolder/sixlabors.imagesharp.web.png";
         public const string PhysicalTestImage = "http://localhost/" + ImagePath;
         public const string AzureTestImage = "http://localhost/" + AzureContainerName + "/" + ImagePath;
         public const string AWSTestImage = "http://localhost/" + AWSBucketName + "/" + ImagePath;
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs
new file mode 100644
index 00000000..6d9918db
--- /dev/null
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestEnvironment.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+#if !ENV_CI
+using System;
+#endif
+
+namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
+{
+    internal static class TestEnvironment
+    {
+        /// <summary>
+        /// Gets a value indicating whether test execution runs on CI.
+        /// </summary>
+#if ENV_CI
+        internal static bool RunsOnCI => true;
+#else
+        internal static bool RunsOnCI
+        {
+            get
+            {
+                // TODO: Something weird going on with our environment constants here.
+                // try reading the environment directly.
+                // https://docs.github.com/en/actions/learn-github-actions/environment-variables
+                string variable = Environment.GetEnvironmentVariable("CI");
+                bool.TryParse(variable, out bool result);
+                return result;
+            }
+        }
+#endif
+    }
+}
diff --git a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
index 768aa6f0..49297037 100644
--- a/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
+++ b/tests/ImageSharp.Web.Tests/TestUtilities/TestServerFixture.cs
@@ -4,11 +4,16 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using SixLabors.ImageSharp.Web.DependencyInjection;
+using SixLabors.ImageSharp.Web.Middleware;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.TestUtilities
 {
@@ -24,6 +29,7 @@ protected TestServerFixture()
             {
                 new KeyValuePair<string, string>("webroot", string.Empty)
             })
+            .AddEnvironmentVariables()
             .Build();
 
             IWebHostBuilder builder = new WebHostBuilder()
@@ -40,9 +46,67 @@ protected TestServerFixture()
 
         public IServiceProvider Services { get; private set; }
 
-        protected abstract void ConfigureServices(IServiceCollection services);
+        protected void ConfigureServices(IServiceCollection services)
+        {
+            IImageSharpBuilder builder = services.AddImageSharp(options =>
+            {
+                Func<ImageCommandContext, Task> onParseCommandsAsync = options.OnParseCommandsAsync;
+
+                options.OnParseCommandsAsync = context =>
+                {
+                    Assert.NotNull(context);
+                    Assert.NotNull(context.Context);
+                    Assert.NotNull(context.Commands);
+                    Assert.NotNull(context.Parser);
+
+                    return onParseCommandsAsync.Invoke(context);
+                };
+
+                Func<ImageProcessingContext, Task> onProcessedAsync = options.OnProcessedAsync;
+
+                options.OnProcessedAsync = context =>
+                {
+                    Assert.NotNull(context);
+                    Assert.NotNull(context.Commands);
+                    Assert.NotNull(context.ContentType);
+                    Assert.NotNull(context.Context);
+                    Assert.NotNull(context.Extension);
+                    Assert.NotNull(context.Stream);
+
+                    return onProcessedAsync.Invoke(context);
+                };
+
+                Func<FormattedImage, Task> onBeforeSaveAsync = options.OnBeforeSaveAsync;
+
+                options.OnBeforeSaveAsync = context =>
+                {
+                    Assert.NotNull(context);
+                    Assert.NotNull(context.Format);
+                    Assert.NotNull(context.Encoder);
+                    Assert.NotNull(context.Image);
+
+                    return onBeforeSaveAsync.Invoke(context);
+                };
+
+                Func<HttpContext, Task> onPrepareResponseAsync = options.OnPrepareResponseAsync;
+
+                options.OnPrepareResponseAsync = context =>
+                {
+                    Assert.NotNull(context);
+                    Assert.NotNull(context.Response);
+
+                    return onPrepareResponseAsync.Invoke(context);
+                };
+            })
+            .ClearProviders()
+            .AddProcessor<CacheBusterWebProcessor>();
+
+            this.ConfigureCustomServices(services, builder);
+        }
+
+        protected virtual void Configure(IApplicationBuilder app) => app.UseImageSharp();
 
-        protected abstract void Configure(IApplicationBuilder app);
+        protected abstract void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder);
 
         protected virtual void Dispose(bool disposing)
         {