diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 0ee001c6..1f7c7266 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -194,7 +194,6 @@
       <code>setDirPermission</code>
       <code>setFileLocking</code>
       <code>setFilePermission</code>
-      <code>setIndexFilename</code>
       <code>setObject</code>
       <code>setObjectCacheMagicProperties</code>
       <code>setObjectCacheMethods</code>
@@ -851,9 +850,6 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="test/Pattern/CaptureCacheTest.php">
-    <MixedMethodCall>
-      <code>setIndexFilename</code>
-    </MixedMethodCall>
     <PossiblyNullArrayAccess>
       <code><![CDATA[$err['message']]]></code>
       <code><![CDATA[$err['message']]]></code>
@@ -866,12 +862,6 @@
       <code>set</code>
       <code>set</code>
     </UndefinedInterfaceMethod>
-    <UndefinedThisPropertyAssignment>
-      <code><![CDATA[$this->options]]></code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch>
-      <code><![CDATA[$this->options]]></code>
-    </UndefinedThisPropertyFetch>
   </file>
   <file src="test/Pattern/ObjectCacheTest.php">
     <MissingClosureParamType>
diff --git a/test/Pattern/AbstractCommonPatternTest.php b/test/Pattern/AbstractCommonPatternTest.php
index a5ff0abc..9ad2a282 100644
--- a/test/Pattern/AbstractCommonPatternTest.php
+++ b/test/Pattern/AbstractCommonPatternTest.php
@@ -17,6 +17,9 @@ abstract class AbstractCommonPatternTest extends TestCase
     /** @var PatternInterface */
     protected $pattern;
 
+    /** @var PatternOptions */
+    protected $options;
+
     protected function setUp(): void
     {
         self::assertInstanceOf(