diff --git a/lib/util/lazy.ts b/lib/util/lazy.ts
index b998e31527f11acdb0d628f0f5c3a669bee4a4da..079413b359f51bb34355082f38067d47c99f7f52 100644
--- a/lib/util/lazy.ts
+++ b/lib/util/lazy.ts
@@ -1,27 +1,43 @@
+interface ValueResult<T> {
+  type: 'success';
+  value: T;
+}
+
+interface ErrorResult {
+  type: 'error';
+  err: Error;
+}
+
 export class Lazy<T> {
-  private _didRun = false;
-  private _value?: T;
-  private _error: Error | undefined;
+  private _result?: ValueResult<T> | ErrorResult;
 
   constructor(private readonly executor: () => T) {}
 
   hasValue(): boolean {
-    return this._didRun;
+    return !!this._result;
   }
 
   getValue(): T {
-    if (!this._didRun) {
-      try {
-        this._value = this.executor();
-      } catch (err) {
-        this._error = err;
-      } finally {
-        this._didRun = true;
+    const result = this._result;
+    if (result) {
+      if (result.type === 'success') {
+        return result.value;
       }
+
+      throw result.err;
     }
-    if (this._error) {
-      throw this._error;
+
+    return this.realizeValue();
+  }
+
+  private realizeValue(): T {
+    try {
+      const value = this.executor();
+      this._result = { type: 'success', value };
+      return value;
+    } catch (err) {
+      this._result = { type: 'error', err };
+      throw err;
     }
-    return this._value;
   }
 }
diff --git a/tsconfig.strict.json b/tsconfig.strict.json
index f985628d41013aea8ca5c6fbff9bac2dbf3912bb..76e486bf5b60e33665c1a4f0a885667ed7075258 100644
--- a/tsconfig.strict.json
+++ b/tsconfig.strict.json
@@ -52,6 +52,8 @@
     "lib/util/host-rules.ts",
     "lib/util/html.ts",
     "lib/util/http/**/.ts",
+    "lib/util/lazy.ts",
+    "lib/util/lazy.spec.ts",
     "lib/util/index.ts",
     "lib/util/json-writer/code-format.ts",
     "lib/util/json-writer/editor-config.ts",