addressing review comments

elastic · May 9, 2024 · 648eefc · 648eefc
1 parent 8990db6
commit 648eefc
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
@@ -466,11 +466,11 @@ export class Execution<
     input: unknown,
     args: Record<string, unknown>
   ): Observable<UnwrapReturnType<Fn['fn']>> {
-    let hash: string | undefined;
-
     return of(input).pipe(
       map((currentInput) => this.cast(currentInput, fn.inputTypes)),
-      map((normalizedInput) => {
+      switchMap((normalizedInput) => {
+        let hash: string | undefined;
+
         if (fn.allowCache && this.context.allowCache) {
           hash = calculateObjectHash([
             fn.name,
@@ -479,9 +479,7 @@ export class Execution<
             this.context.getSearchContext(),
           ]);
         }
-        return normalizedInput;
-      }),
-      switchMap((normalizedInput) => {
+
         if (hash && this.functionCache.has(hash)) {
           const cached = this.functionCache.get(hash);
           if (cached && Date.now() - cached.time < this.cacheTimeout) {