diff --git a/paket.dependencies b/paket.dependencies
index c573a29..d9ab376 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,10 +1,12 @@
 version 7.2.1
+storage: none
 source https://api.nuget.org/v3/index.json
 frameworks: net6.0, netstandard2.0
 
 nuget FSharp.Core ~> 6 // We need task{} CE from F# 6.0
-nuget System.Text.Json ~> 6
 nuget FSharp.SystemTextJson
+nuget FSharp.TypeProviders.SDK >= 8
+nuget System.Text.Json ~> 6
 nuget Microsoft.OpenApi.Readers
 nuget NETStandard.Library.NETFramework
 
@@ -14,10 +16,6 @@ nuget Microsoft.Bcl.AsyncInterfaces ~> 6
 # delete when we drop custom parser for v2
 nuget YamlDotNet
 
-# THis lines are used by Paket to get the latest version of the Type Provider SDK files
-github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fsi
-github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs
-
 github fsprojects/FSharp.Data:main src/FSharp.Data.Runtime.Utilities/Pluralizer.fs
 github fsprojects/FSharp.Data:main src/FSharp.Data.Runtime.Utilities/NameUtils.fs
 
diff --git a/paket.lock b/paket.lock
index de4a846..2e08137 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,15 +1,18 @@
+STORAGE: NONE
 RESTRICTION: || (== net6.0) (== netstandard2.0)
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FSharp.Core (6.0.7)
-    FSharp.SystemTextJson (1.1.23)
+    FSharp.SystemTextJson (1.2.42)
       FSharp.Core (>= 4.7)
       System.Text.Json (>= 6.0)
+    FSharp.TypeProviders.SDK (8.0.2)
+      FSharp.Core (>= 4.7.2)
     Microsoft.Bcl.AsyncInterfaces (6.0)
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
-    Microsoft.OpenApi (1.6.5)
-    Microsoft.OpenApi.Readers (1.6.5)
-      Microsoft.OpenApi (>= 1.6.5)
+    Microsoft.OpenApi (1.6.9)
+    Microsoft.OpenApi.Readers (1.6.9)
+      Microsoft.OpenApi (>= 1.6.9)
       SharpYaml (>= 2.1)
     NETStandard.Library.NETFramework (2.0.0-preview2-25405-01)
     SharpYaml (2.1)
@@ -34,14 +37,11 @@ NUGET
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
     System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (== netstandard2.0)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
-    YamlDotNet (13.1.1)
+    YamlDotNet (13.7.1)
 GITHUB
-  remote: fsprojects/FSharp.TypeProviders.SDK
-    src/ProvidedTypes.fs (b7c930b0bd9e0e0476981ba0813ac17e7d61742b)
-    src/ProvidedTypes.fsi (b7c930b0bd9e0e0476981ba0813ac17e7d61742b)
   remote: fsprojects/FSharp.Data
-    src/FSharp.Data.Runtime.Utilities/NameUtils.fs (5088a474da5756b4537a356ba3a016eecafca596)
-    src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (5088a474da5756b4537a356ba3a016eecafca596)
+    src/FSharp.Data.Runtime.Utilities/NameUtils.fs (6e7d332943f1b26be034d283ef292296913d40ab)
+    src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (6e7d332943f1b26be034d283ef292296913d40ab)
 GROUP Server
 RESTRICTION: == net6.0
 NUGET
diff --git a/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj b/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj
index 45bc994..2088125 100644
--- a/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj
+++ b/src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj
@@ -21,14 +21,6 @@
       <Paket>True</Paket>
       <Link>paket-files/NameUtils.fs</Link>
     </Compile>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">
-      <Paket>True</Paket>
-      <Link>paket-files/ProvidedTypes.fsi</Link>
-    </Compile>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fs">
-      <Paket>True</Paket>
-      <Link>paket-files/ProvidedTypes.fs</Link>
-    </Compile>
     <Compile Include="..\SwaggerProvider.Runtime\ProvidedApiClientBase.fs">
       <Link>ProvidedApiClientBase.fs</Link>
     </Compile>
diff --git a/src/SwaggerProvider.DesignTime/paket.references b/src/SwaggerProvider.DesignTime/paket.references
index 2b83f2e..82e71c0 100644
--- a/src/SwaggerProvider.DesignTime/paket.references
+++ b/src/SwaggerProvider.DesignTime/paket.references
@@ -1,9 +1,8 @@
-File: ProvidedTypes.fsi
-File: ProvidedTypes.fs
 File: Pluralizer.fs
 File: NameUtils.fs
 
 System.Text.Json
 Microsoft.OpenApi.Readers
+FSharp.TypeProviders.SDK
 
 YamlDotNet
diff --git a/src/SwaggerProvider.DesignTime/v2/DefinitionCompiler.fs b/src/SwaggerProvider.DesignTime/v2/DefinitionCompiler.fs
index 92b1a00..1ab8e35 100644
--- a/src/SwaggerProvider.DesignTime/v2/DefinitionCompiler.fs
+++ b/src/SwaggerProvider.DesignTime/v2/DefinitionCompiler.fs
@@ -3,7 +3,6 @@ namespace SwaggerProvider.Internal.v2.Compilers
 open System
 open System.Reflection
 open ProviderImplementation.ProvidedTypes
-open UncheckedQuotations
 open FSharp.Data.Runtime.NameUtils
 open SwaggerProvider.Internal.v2.Parser.Schema
 open Swagger.Internal
@@ -172,11 +171,11 @@ type DefinitionCompiler(schema: SwaggerObject, provideNullable) as this =
                 ty,
                 getterCode =
                     (function
-                    | [ this ] -> Expr.FieldGetUnchecked(this, providedField)
+                    | [ this ] -> Expr.FieldGet(this, providedField)
                     | _ -> failwith "invalid property getter params"),
                 setterCode =
                     (function
-                    | [ this; v ] -> Expr.FieldSetUnchecked(this, providedField, v)
+                    | [ this; v ] -> Expr.FieldSet(this, providedField, v)
                     | _ -> failwith "invalid property setter params")
             )
 
@@ -279,7 +278,7 @@ type DefinitionCompiler(schema: SwaggerObject, provideNullable) as this =
                                 | _ -> failwith "Wrong constructor arguments"
 
                             List.zip args fields
-                            |> List.map(fun (arg, f) -> Expr.FieldSetUnchecked(this, f, arg))
+                            |> List.map(fun (arg, f) -> Expr.FieldSet(this, f, arg))
                             |> List.rev
                             |> List.fold (fun a b -> Expr.Sequential(a, b)) <@@ () @@>
                 )
diff --git a/src/SwaggerProvider.DesignTime/v3/DefinitionCompiler.fs b/src/SwaggerProvider.DesignTime/v3/DefinitionCompiler.fs
index 370dd8c..c1b8569 100644
--- a/src/SwaggerProvider.DesignTime/v3/DefinitionCompiler.fs
+++ b/src/SwaggerProvider.DesignTime/v3/DefinitionCompiler.fs
@@ -3,7 +3,6 @@ namespace SwaggerProvider.Internal.v3.Compilers
 open System
 open System.Reflection
 open ProviderImplementation.ProvidedTypes
-open UncheckedQuotations
 open FSharp.Data.Runtime.NameUtils
 open Swagger.Internal
 open SwaggerProvider.Internal
@@ -194,11 +193,11 @@ type DefinitionCompiler(schema: OpenApiDocument, provideNullable) as this =
                 ty,
                 getterCode =
                     (function
-                    | [ this ] -> Expr.FieldGetUnchecked(this, providedField)
+                    | [ this ] -> Expr.FieldGet(this, providedField)
                     | _ -> failwith "invalid property getter params"),
                 setterCode =
                     (function
-                    | [ this; v ] -> Expr.FieldSetUnchecked(this, providedField, v)
+                    | [ this; v ] -> Expr.FieldSet(this, providedField, v)
                     | _ -> failwith "invalid property setter params")
             )
 
@@ -307,7 +306,7 @@ type DefinitionCompiler(schema: OpenApiDocument, provideNullable) as this =
                                 | _ -> failwith "Wrong constructor arguments"
 
                             List.zip args fields
-                            |> List.map(fun (arg, f) -> Expr.FieldSetUnchecked(this, f, arg))
+                            |> List.map(fun (arg, f) -> Expr.FieldSet(this, f, arg))
                             |> List.rev
                             |> List.fold (fun a b -> Expr.Sequential(a, b)) <@@ () @@>
                 )
diff --git a/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj b/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj
index 8c363a2..674973f 100644
--- a/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj
+++ b/src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj
@@ -10,14 +10,9 @@
   </PropertyGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <ItemGroup>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">
-      <Paket>True</Paket>
-      <Link>paket-files/ProvidedTypes.fsi</Link>
-    </Compile>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fs">
-      <Paket>True</Paket>
-      <Link>paket-files/ProvidedTypes.fs</Link>
-    </Compile>
+    <PackageReference Update="FSharp.Core" ExcludeAssets="contentFiles" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="..\Common\AssemblyInfo.fs">
       <Link>AssemblyInfo.fs</Link>
     </Compile>
diff --git a/src/SwaggerProvider.Runtime/paket.references b/src/SwaggerProvider.Runtime/paket.references
index f41423f..7eff8d0 100644
--- a/src/SwaggerProvider.Runtime/paket.references
+++ b/src/SwaggerProvider.Runtime/paket.references
@@ -1,5 +1,2 @@
-File: ProvidedTypes.fsi
-File: ProvidedTypes.fs
-
 FSharp.Core
 FSharp.SystemTextJson