diff --git a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
index 669b152..a65343c 100644
--- a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
@@ -22,7 +22,7 @@ namespace MusicStore.Mocks.Facebook
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.5/oauth/access_token"))
             {
-                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
+                var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync());
                 if (formData["grant_type"] == "authorization_code")
                 {
                     if (formData["code"] == "ValidCode")
diff --git a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
index d2f097c..820e894 100644
--- a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
@@ -21,7 +21,7 @@ namespace MusicStore.Mocks.Google
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://www.googleapis.com/oauth2/v3/token"))
             {
-                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
+                var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync());
                 if (formData["grant_type"] == "authorization_code")
                 {
                     if (formData["code"] == "ValidCode")
diff --git a/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
index d0adf00..119b613 100644
--- a/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
+++ b/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
@@ -21,7 +21,7 @@ namespace MusicStore.Mocks.MicrosoftAccount
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://login.microsoftonline.com/common/oauth2/v2.0/token"))
             {
-                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
+                var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync());
                 if (formData["grant_type"] == "authorization_code")
                 {
                     if (formData["code"] == "ValidCode")
diff --git a/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
index e4dbbae..9a8074b 100644
--- a/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
@@ -23,7 +23,7 @@ namespace MusicStore.Mocks.Twitter
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://api.twitter.com/oauth/access_token"))
             {
-                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
+                var formData = new FormCollection(await new FormReader(await request.Content.ReadAsStreamAsync()).ReadFormAsync());
                 if (formData["oauth_verifier"] == "valid_oauth_verifier")
                 {
                     if (_requestTokenEndpointInvoked)