diff -U3 /tmp/cirrus-ci-build/src/test/modules/delay_execution/expected/cached-plan-inval.out /tmp/cirrus-ci-build/build/testrun/delay_execution/isolation/results/cached-plan-inval.out
--- /tmp/cirrus-ci-build/src/test/modules/delay_execution/expected/cached-plan-inval.out	2025-02-05 23:51:14.280202000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/delay_execution/isolation/results/cached-plan-inval.out	2025-02-05 23:54:51.832094000 +0000
@@ -49,20 +49,17 @@
 		  PREPARE q2 AS SELECT * FROM foov WHERE a = one() or a = two();
 		  EXPLAIN (COSTS OFF) EXECUTE q2;
 s1: NOTICE:  Finished ExecutorStart(): CachedPlan is valid
-QUERY PLAN                                        
---------------------------------------------------
-Append                                            
-  Subplans Removed: 1                             
-  ->  Bitmap Heap Scan on foo12_1 foo_1           
-        Recheck Cond: ((a = one()) OR (a = two()))
-        ->  BitmapOr                              
-              ->  Bitmap Index Scan on foo12_1_a  
-                    Index Cond: (a = one())       
-              ->  Bitmap Index Scan on foo12_1_a  
-                    Index Cond: (a = two())       
-  ->  Seq Scan on foo12_2 foo_2                   
-        Filter: ((a = one()) OR (a = two()))      
-(11 rows)
+QUERY PLAN                                               
+---------------------------------------------------------
+Append                                                   
+  Subplans Removed: 1                                    
+  ->  Bitmap Heap Scan on foo12_1 foo_1                  
+        Filter: ((a = one()) OR (a = two()))             
+        ->  Bitmap Index Scan on foo12_1_a               
+              Index Cond: (a = ANY (ARRAY[one(), two()]))
+  ->  Seq Scan on foo12_2 foo_2                          
+        Filter: ((a = one()) OR (a = two()))             
+(8 rows)
 
 step s2lock: SELECT pg_advisory_lock(12345);
 pg_advisory_lock
@@ -101,65 +98,56 @@
 s1: NOTICE:  Finished ExecutorStart(): CachedPlan is valid
 s1: NOTICE:  Finished ExecutorStart(): CachedPlan is valid
 s1: NOTICE:  Finished ExecutorStart(): CachedPlan is valid
-QUERY PLAN                                                    
---------------------------------------------------------------
-Nested Loop                                                   
-  ->  Append                                                  
-        Subplans Removed: 1                                   
-        ->  Bitmap Heap Scan on foo12_1 foo_1                 
-              Recheck Cond: ((a = one()) OR (a = two()))      
-              ->  BitmapOr                                    
-                    ->  Bitmap Index Scan on foo12_1_a        
-                          Index Cond: (a = one())             
-                    ->  Bitmap Index Scan on foo12_1_a        
-                          Index Cond: (a = two())             
-        ->  Seq Scan on foo12_2 foo_2                         
-              Filter: ((a = one()) OR (a = two()))            
-  ->  Materialize                                             
-        ->  Append                                            
-              Subplans Removed: 1                             
-              ->  Bitmap Heap Scan on bar1 bar_1              
-                    Recheck Cond: (a = one())                 
-                    ->  Bitmap Index Scan on bar1_a_idx       
-                          Index Cond: (a = one())             
-                                                              
-Update on bar                                                 
-  Update on bar1 bar_1                                        
-  ->  Nested Loop                                             
-        ->  Append                                            
-              Subplans Removed: 1                             
-              ->  Bitmap Heap Scan on foo12_1 foo_1           
-                    Recheck Cond: ((a = one()) OR (a = two()))
-                    ->  BitmapOr                              
-                          ->  Bitmap Index Scan on foo12_1_a  
-                                Index Cond: (a = one())       
-                          ->  Bitmap Index Scan on foo12_1_a  
-                                Index Cond: (a = two())       
-              ->  Seq Scan on foo12_2 foo_2                   
-                    Filter: ((a = one()) OR (a = two()))      
-        ->  Materialize                                       
-              ->  Append                                      
-                    Subplans Removed: 1                       
-                    ->  Bitmap Heap Scan on bar1 bar_1        
-                          Recheck Cond: (a = one())           
-                          ->  Bitmap Index Scan on bar1_a_idx 
-                                Index Cond: (a = one())       
-                                                              
-Update on foo                                                 
-  Update on foo12_1 foo_1                                     
-  Update on foo12_2 foo_2                                     
-  ->  Append                                                  
-        Subplans Removed: 1                                   
-        ->  Bitmap Heap Scan on foo12_1 foo_1                 
-              Recheck Cond: ((a = one()) OR (a = two()))      
-              ->  BitmapOr                                    
-                    ->  Bitmap Index Scan on foo12_1_a        
-                          Index Cond: (a = one())             
-                    ->  Bitmap Index Scan on foo12_1_a        
-                          Index Cond: (a = two())             
-        ->  Seq Scan on foo12_2 foo_2                         
-              Filter: ((a = one()) OR (a = two()))            
-(56 rows)
+QUERY PLAN                                                           
+---------------------------------------------------------------------
+Nested Loop                                                          
+  ->  Append                                                         
+        Subplans Removed: 1                                          
+        ->  Bitmap Heap Scan on foo12_1 foo_1                        
+              Filter: ((a = one()) OR (a = two()))                   
+              ->  Bitmap Index Scan on foo12_1_a                     
+                    Index Cond: (a = ANY (ARRAY[one(), two()]))      
+        ->  Seq Scan on foo12_2 foo_2                                
+              Filter: ((a = one()) OR (a = two()))                   
+  ->  Materialize                                                    
+        ->  Append                                                   
+              Subplans Removed: 1                                    
+              ->  Bitmap Heap Scan on bar1 bar_1                     
+                    Recheck Cond: (a = one())                        
+                    ->  Bitmap Index Scan on bar1_a_idx              
+                          Index Cond: (a = one())                    
+                                                                     
+Update on bar                                                        
+  Update on bar1 bar_1                                               
+  ->  Nested Loop                                                    
+        ->  Append                                                   
+              Subplans Removed: 1                                    
+              ->  Bitmap Heap Scan on foo12_1 foo_1                  
+                    Filter: ((a = one()) OR (a = two()))             
+                    ->  Bitmap Index Scan on foo12_1_a               
+                          Index Cond: (a = ANY (ARRAY[one(), two()]))
+              ->  Seq Scan on foo12_2 foo_2                          
+                    Filter: ((a = one()) OR (a = two()))             
+        ->  Materialize                                              
+              ->  Append                                             
+                    Subplans Removed: 1                              
+                    ->  Bitmap Heap Scan on bar1 bar_1               
+                          Recheck Cond: (a = one())                  
+                          ->  Bitmap Index Scan on bar1_a_idx        
+                                Index Cond: (a = one())              
+                                                                     
+Update on foo                                                        
+  Update on foo12_1 foo_1                                            
+  Update on foo12_2 foo_2                                            
+  ->  Append                                                         
+        Subplans Removed: 1                                          
+        ->  Bitmap Heap Scan on foo12_1 foo_1                        
+              Filter: ((a = one()) OR (a = two()))                   
+              ->  Bitmap Index Scan on foo12_1_a                     
+                    Index Cond: (a = ANY (ARRAY[one(), two()]))      
+        ->  Seq Scan on foo12_2 foo_2                                
+              Filter: ((a = one()) OR (a = two()))                   
+(47 rows)
 
 step s2lock: SELECT pg_advisory_lock(12345);
 pg_advisory_lock