diff --git a/base/src/com/google/idea/blaze/base/buildmodifier/BuildifierFormattingService.java b/base/src/com/google/idea/blaze/base/buildmodifier/BuildifierFormattingService.java
index 4fa727abbcc..2ee564d7557 100644
--- a/base/src/com/google/idea/blaze/base/buildmodifier/BuildifierFormattingService.java
+++ b/base/src/com/google/idea/blaze/base/buildmodifier/BuildifierFormattingService.java
@@ -41,14 +41,11 @@ public final class BuildifierFormattingService extends AsyncDocumentFormattingSe
   static final FeatureRolloutExperiment useNewBuildifierFormattingService =
       new FeatureRolloutExperiment("formatter.api.buildifier");
 
-  static final Supplier<Optional<String>> binaryPath = Suppliers.memoize(() -> getBinary());
-
   @Override
   @Nullable
   protected FormattingTask createFormattingTask(AsyncFormattingRequest request) {
     BuildFile buildFile = (BuildFile) request.getContext().getContainingFile();
-    return binaryPath
-        .get()
+    return getBinary()
         .map(binary -> BuildFileFormatter.getCommandLineArgs(binary, buildFile))
         .map(args -> new BuildifierFormattingTask(request, args))
         .orElse(null);
@@ -75,7 +72,7 @@ public ImmutableSet<Feature> getFeatures() {
   public boolean canFormat(PsiFile file) {
     return useNewBuildifierFormattingService.isEnabled()
         && file instanceof BuildFile
-        && binaryPath.get().isPresent();
+        && getBinary().isPresent();
   }
 
   private static Optional<String> getBinary() {