diff --git a/src/Features/CSharp/Portable/UseExpressionBody/AbstractUseExpressionBodyCodeFixProvider.cs b/src/Features/CSharp/Portable/UseExpressionBody/AbstractUseExpressionBodyCodeFixProvider.cs
index e1a86c2f153f2e652f345bc7ab946fb1228611ce..9895b3db0273b76030a680f9e401d176786a462f 100644
--- a/src/Features/CSharp/Portable/UseExpressionBody/AbstractUseExpressionBodyCodeFixProvider.cs
+++ b/src/Features/CSharp/Portable/UseExpressionBody/AbstractUseExpressionBodyCodeFixProvider.cs
@@ -41,10 +41,10 @@ internal abstract partial class AbstractUseExpressionBodyCodeFixProvider<TDeclar
             _useBlockBodyTitle = useBlockBodyTitle;
         }
 
-        public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
+        public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             var diagnostic = context.Diagnostics.First();
-            var option = context.Document.Project.Solution.Workspace.Options.GetOption(_option);
+            var option = (await context.Document.GetOptionsAsync(context.CancellationToken).ConfigureAwait(false)).GetOption(_option);
             var title = option.Value
                 ? _useExpressionBodyTitle
                 : _useBlockBodyTitle;
@@ -52,15 +52,13 @@ public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
             context.RegisterCodeFix(
                 new MyCodeAction(title, c => FixAsync(context.Document, diagnostic, c)),
                 diagnostic);
-
-            return SpecializedTasks.EmptyTask;
         }
 
-        protected override Task FixAllAsync(
+        protected override async Task FixAllAsync(
             Document document, ImmutableArray<Diagnostic> diagnostics,
             SyntaxEditor editor, CancellationToken cancellationToken)
         {
-            var options = document.Project.Solution.Options;
+            var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
             var preferExpressionBody = options.GetOption(_option).Value;
 
             foreach (var diagnostic in diagnostics)
@@ -68,8 +66,6 @@ public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
                 cancellationToken.ThrowIfCancellationRequested();
                 AddEdits(editor, diagnostic, options, preferExpressionBody, cancellationToken);
             }
-
-            return SpecializedTasks.EmptyTask;
         }
 
         private void AddEdits(