diff --git a/composer.json b/composer.json
index 8134d2456b7..4806cdddc98 100644
--- a/composer.json
+++ b/composer.json
@@ -40,15 +40,15 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2021.1",
-        "phpstan/phpstan": "1.1.1",
+        "phpstan/phpstan": "1.2.0",
         "phpstan/phpstan-phpunit": "1.0.0",
-        "phpstan/phpstan-strict-rules": "1.0.0",
+        "phpstan/phpstan-strict-rules": "1.1.0",
         "phpunit/phpunit": "9.5.10",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.1",
         "symfony/cache": "^5.2|^6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
-        "vimeo/psalm": "4.12.0"
+        "vimeo/psalm": "4.13.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."
diff --git a/docs/en/reference/caching.rst b/docs/en/reference/caching.rst
index e22f4aeb0c0..3f620ac9c33 100644
--- a/docs/en/reference/caching.rst
+++ b/docs/en/reference/caching.rst
@@ -1,7 +1,7 @@
 Caching
 =======
 
-A ``Doctrine\DBAL\Statement`` can automatically cache result sets. The
+A ``Doctrine\DBAL\Connection`` can automatically cache result sets. The
 feature is optional though, and by default, no result set is cached.
 
 To use the result cache, there are three mandatory steps:
@@ -9,7 +9,6 @@ To use the result cache, there are three mandatory steps:
 1. Configure a global result cache, or provide one at query time.
 2. Provide a cache profile for the result set you want to cache when
    making a query.
-3. Read the entire result set from the database.
 
 Configuring the result cache
 ----------------------------
@@ -53,24 +52,3 @@ default cache instance:
     <?php
     $cache = new \Symfony\Component\Cache\Adapter\FilesystemAdapter();
     new QueryCacheProfile(0, "some key", $cache);
-
-Reading the entire result set
------------------------------
-
-Caching half a result set would cause bugs if a subsequent caller needed
-more rows from that same result sets. To be able to cache the entire
-result set, it must be fetched entirely from the database, and not all
-APIs do that. The easiest way to ensure that is to use one of the
-``fetchAll*()`` methods:
-
-::
-
-    <?php
-    $stmt = $conn->executeCacheQuery($query, $params, $types, new QueryCacheProfile(0, "some key"));
-    $data = $stmt->fetchAllAssociative();
-
-.. warning::
-
-    When using the cache layer not all fetch modes are supported. See
-    the code of the ``Doctrine\DBAL\Cache\CachingResult`` for
-    details.
diff --git a/psalm.xml.dist b/psalm.xml.dist
index c05cc040e57..f4b4972772c 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -195,12 +195,6 @@
                 <file name="tests/Functional/Schema/SchemaManagerFunctionalTestCase.php"/>
             </errorLevel>
         </TypeDoesNotContainNull>
-        <TypeDoesNotContainType>
-            <errorLevel type="suppress">
-                <!-- See https://github.com/vimeo/psalm/issues/4274 -->
-                <file name="src/Schema/Index.php"/>
-            </errorLevel>
-        </TypeDoesNotContainType>
         <UndefinedConstant>
             <errorLevel type="suppress">
                 <!--
diff --git a/src/Cache/CachingResult.php b/src/Cache/CachingResult.php
deleted file mode 100644
index eed8db6b12d..00000000000
--- a/src/Cache/CachingResult.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Cache;
-
-use Doctrine\DBAL\Driver\Exception;
-use Doctrine\DBAL\Driver\FetchUtils;
-use Doctrine\DBAL\Driver\Result as DriverResult;
-use Doctrine\DBAL\Result;
-use Psr\Cache\CacheItemPoolInterface;
-
-use function array_map;
-use function array_values;
-
-/**
- * A result is saved in multiple cache keys, there is the originally specified
- * cache key which is just pointing to result rows by key. The following things
- * have to be ensured:
- *
- * 1. lifetime of the original key has to be longer than that of all the individual rows keys
- * 2. if any one row key is missing the query has to be re-executed.
- *
- * Also you have to realize that the cache will load the whole result into memory at once to ensure 2.
- * This means that the memory usage for cached results might increase by using this feature.
- *
- * @internal The class is internal to the caching layer implementation.
- */
-final class CachingResult implements DriverResult
-{
-    private CacheItemPoolInterface $cache;
-
-    private string $cacheKey;
-
-    private string $realKey;
-
-    private int $lifetime;
-
-    private Result $result;
-
-    /** @var array<int,array<string,mixed>>|null */
-    private ?array $data = null;
-
-    public function __construct(
-        Result $result,
-        CacheItemPoolInterface $cache,
-        string $cacheKey,
-        string $realKey,
-        int $lifetime
-    ) {
-        $this->result   = $result;
-        $this->cache    = $cache;
-        $this->cacheKey = $cacheKey;
-        $this->realKey  = $realKey;
-        $this->lifetime = $lifetime;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchNumeric()
-    {
-        $row = $this->fetch();
-
-        if ($row === false) {
-            return false;
-        }
-
-        return array_values($row);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchAssociative()
-    {
-        return $this->fetch();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchOne()
-    {
-        return FetchUtils::fetchOne($this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchAllNumeric(): array
-    {
-        return array_map('array_values', $this->fetchAllAssociative());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchAllAssociative(): array
-    {
-        $data = $this->result->fetchAllAssociative();
-
-        $this->store($data);
-
-        return $data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchFirstColumn(): array
-    {
-        return FetchUtils::fetchFirstColumn($this);
-    }
-
-    public function rowCount(): int
-    {
-        return $this->result->rowCount();
-    }
-
-    public function columnCount(): int
-    {
-        return $this->result->columnCount();
-    }
-
-    public function free(): void
-    {
-        $this->data = null;
-    }
-
-    /**
-     * @return array<string,mixed>|false
-     *
-     * @throws Exception
-     */
-    private function fetch()
-    {
-        if ($this->data === null) {
-            $this->data = [];
-        }
-
-        $row = $this->result->fetchAssociative();
-
-        if ($row !== false) {
-            $this->data[] = $row;
-
-            return $row;
-        }
-
-        $this->saveToCache();
-
-        return false;
-    }
-
-    /**
-     * @param array<int,array<string,mixed>> $data
-     */
-    private function store(array $data): void
-    {
-        $this->data = $data;
-
-        $this->saveToCache();
-    }
-
-    private function saveToCache(): void
-    {
-        if ($this->data === null) {
-            return;
-        }
-
-        $item                 = $this->cache->getItem($this->cacheKey);
-        $data                 = $item->isHit() ? $item->get() : [];
-        $data[$this->realKey] = $this->data;
-
-        $item->set($data);
-        if ($this->lifetime > 0) {
-            $item->expiresAfter($this->lifetime);
-        }
-
-        $this->cache->save($item);
-    }
-}
diff --git a/src/Connection.php b/src/Connection.php
index 3b050be4457..00900546c08 100644
--- a/src/Connection.php
+++ b/src/Connection.php
@@ -8,7 +8,6 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Cache\ArrayResult;
 use Doctrine\DBAL\Cache\CacheException;
-use Doctrine\DBAL\Cache\CachingResult;
 use Doctrine\DBAL\Cache\Exception\NoResultDriverConfigured;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\DBAL\Connection\StaticServerVersionProvider;
@@ -35,7 +34,6 @@
 use Throwable;
 use Traversable;
 
-use function array_key_exists;
 use function assert;
 use function count;
 use function implode;
@@ -906,30 +904,31 @@ public function executeCacheQuery(string $sql, array $params, array $types, Quer
 
         [$cacheKey, $realKey] = $qcp->generateCacheKeys($sql, $params, $types, $connectionParams);
 
-        // fetch the row pointers entry
         $item = $resultCache->getItem($cacheKey);
 
         if ($item->isHit()) {
-            $data = $item->get();
-            // is the real key part of this row pointers map or is the cache only pointing to other cache keys?
-            if (isset($data[$realKey])) {
-                $result = new ArrayResult($data[$realKey]);
-            } elseif (array_key_exists($realKey, $data)) {
-                $result = new ArrayResult([]);
+            $value = $item->get();
+            if (isset($value[$realKey])) {
+                return new Result(new ArrayResult($value[$realKey]), $this);
             }
+        } else {
+            $value = [];
         }
 
-        if (! isset($result)) {
-            $result = new CachingResult(
-                $this->executeQuery($sql, $params, $types),
-                $resultCache,
-                $cacheKey,
-                $realKey,
-                $qcp->getLifetime()
-            );
+        $data = $this->fetchAllAssociative($sql, $params, $types);
+
+        $value[$realKey] = $data;
+
+        $item->set($value);
+
+        $lifetime = $qcp->getLifetime();
+        if ($lifetime > 0) {
+            $item->expiresAfter($lifetime);
         }
 
-        return new Result($result, $this);
+        $resultCache->save($item);
+
+        return new Result(new ArrayResult($data), $this);
     }
 
     /**
diff --git a/src/Driver/OCI8/Connection.php b/src/Driver/OCI8/Connection.php
index 4e5c77f2e81..45fb5db8a8b 100644
--- a/src/Driver/OCI8/Connection.php
+++ b/src/Driver/OCI8/Connection.php
@@ -49,7 +49,8 @@ public function getServerVersion(): string
             throw Error::new($this->connection);
         }
 
-        assert(preg_match('/\s+(\d+\.\d+\.\d+\.\d+\.\d+)\s+/', $version, $matches) === 1);
+        $result = preg_match('/\s+(\d+\.\d+\.\d+\.\d+\.\d+)\s+/', $version, $matches);
+        assert($result === 1);
 
         return $matches[1];
     }
diff --git a/tests/Connection/CachedQueryTest.php b/tests/Connection/CachedQueryTest.php
new file mode 100644
index 00000000000..a14b710b328
--- /dev/null
+++ b/tests/Connection/CachedQueryTest.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Connection;
+
+use Doctrine\DBAL\Cache\ArrayResult;
+use Doctrine\DBAL\Cache\QueryCacheProfile;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+
+class CachedQueryTest extends TestCase
+{
+    public function testCachedQuery(): void
+    {
+        $cache = new ArrayAdapter();
+        $data  = [['foo' => 'bar']];
+
+        $connection = $this->createConnection(1, $data);
+        $qcp        = new QueryCacheProfile(0, __FUNCTION__, $cache);
+
+        self::assertSame($data, $connection->executeCacheQuery('SELECT 1', [], [], $qcp)->fetchAllAssociative());
+        self::assertSame($data, $connection->executeCacheQuery('SELECT 1', [], [], $qcp)->fetchAllAssociative());
+
+        self::assertCount(1, $cache->getItem(__FUNCTION__)->get());
+    }
+
+    public function testCachedQueryWithChangedImplementationIsExecutedTwice(): void
+    {
+        $data = [['baz' => 'qux']];
+
+        $connection = $this->createConnection(2, $data);
+
+        self::assertSame($data, $connection->executeCacheQuery(
+            'SELECT 1',
+            [],
+            [],
+            new QueryCacheProfile(0, __FUNCTION__, new ArrayAdapter())
+        )->fetchAllAssociative());
+
+        self::assertSame($data, $connection->executeCacheQuery(
+            'SELECT 1',
+            [],
+            [],
+            new QueryCacheProfile(0, __FUNCTION__, new ArrayAdapter())
+        )->fetchAllAssociative());
+    }
+
+    /**
+     * @param list<array<string, mixed>> $data
+     */
+    private function createConnection(int $expectedQueryCount, array $data): Connection
+    {
+        $connection = $this->createMock(Driver\Connection::class);
+        $connection->expects(self::exactly($expectedQueryCount))
+            ->method('query')
+            ->willReturnCallback(static function () use ($data): ArrayResult {
+                return new ArrayResult($data);
+            });
+
+        $driver = $this->createMock(Driver::class);
+        $driver->method('connect')
+            ->willReturn($connection);
+
+        return new Connection([], $driver);
+    }
+}
diff --git a/tests/Functional/ResultCacheTest.php b/tests/Functional/ResultCacheTest.php
deleted file mode 100644
index 7ab79814d46..00000000000
--- a/tests/Functional/ResultCacheTest.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Tests\Functional;
-
-use Doctrine\DBAL\Cache\QueryCacheProfile;
-use Doctrine\DBAL\Logging\DebugStack;
-use Doctrine\DBAL\Result;
-use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Tests\FunctionalTestCase;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-
-use function array_change_key_case;
-use function array_shift;
-use function array_values;
-use function is_array;
-
-use const CASE_LOWER;
-
-class ResultCacheTest extends FunctionalTestCase
-{
-    /** @var list<array{test_int: int, test_string: string}> */
-    private $expectedResult = [
-        ['test_int' => 100, 'test_string' => 'foo'],
-        ['test_int' => 200, 'test_string' => 'bar'],
-        ['test_int' => 300, 'test_string' => 'baz'],
-    ];
-
-    private DebugStack $sqlLogger;
-
-    protected function setUp(): void
-    {
-        $table = new Table('caching');
-        $table->addColumn('test_int', 'integer');
-        $table->addColumn('test_string', 'string', [
-            'length' => 8,
-            'notnull' => false,
-        ]);
-        $table->setPrimaryKey(['test_int']);
-
-        $this->dropAndCreateTable($table);
-
-        foreach ($this->expectedResult as $row) {
-            $this->connection->insert('caching', $row);
-        }
-
-        $config = $this->connection->getConfiguration();
-        $config->setSQLLogger($this->sqlLogger = new DebugStack());
-
-        $cache = new ArrayAdapter();
-        $config->setResultCache($cache);
-    }
-
-    public function testCacheFetchAssociative(): void
-    {
-        $this->assertCacheNonCacheSelectSameFetchModeAreEqual(
-            $this->expectedResult,
-            static function (Result $result) {
-                return $result->fetchAssociative();
-            }
-        );
-    }
-
-    public function testFetchNumeric(): void
-    {
-        $expectedResult = [];
-        foreach ($this->expectedResult as $v) {
-            $expectedResult[] = array_values($v);
-        }
-
-        $this->assertCacheNonCacheSelectSameFetchModeAreEqual(
-            $expectedResult,
-            static function (Result $result) {
-                return $result->fetchNumeric();
-            }
-        );
-    }
-
-    public function testFetchOne(): void
-    {
-        $expectedResult = [];
-        foreach ($this->expectedResult as $v) {
-            $expectedResult[] = array_shift($v);
-        }
-
-        $this->assertCacheNonCacheSelectSameFetchModeAreEqual(
-            $expectedResult,
-            static function (Result $result) {
-                return $result->fetchOne();
-            }
-        );
-    }
-
-    public function testMixingFetch(): void
-    {
-        $numExpectedResult = [];
-        foreach ($this->expectedResult as $v) {
-            $numExpectedResult[] = array_values($v);
-        }
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $data = $this->hydrateViaFetchAll($stmt, static function (Result $result): array {
-            return $result->fetchAllAssociative();
-        });
-
-        self::assertEquals($this->expectedResult, $data);
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $data = $this->hydrateViaFetchAll($stmt, static function (Result $result): array {
-            return $result->fetchAllNumeric();
-        });
-
-        self::assertEquals($numExpectedResult, $data);
-    }
-
-    /**
-     * @dataProvider fetchProvider
-     */
-    public function testFetchViaIteration(callable $fetch, callable $fetchAll): void
-    {
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $data = $this->hydrateViaFetchAll($stmt, $fetchAll);
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $iterator = $this->hydrateViaIteration($stmt, $fetch);
-
-        self::assertEquals($data, $iterator);
-    }
-
-    public function testFetchAndFinishSavesCache(): void
-    {
-        $result = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $result->fetchAllAssociative();
-
-        $result = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $result->fetchAllNumeric();
-
-        self::assertCount(1, $this->sqlLogger->queries, 'Only one query has hit the database.');
-    }
-
-    public function testDontFinishNoCache(): void
-    {
-        $result = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $result->fetchAssociative();
-
-        $result = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        $this->hydrateViaIteration($result, static function (Result $result) {
-            return $result->fetchNumeric();
-        });
-
-        self::assertCount(2, $this->sqlLogger->queries, 'Two queries have hit the database.');
-    }
-
-    /**
-     * @dataProvider fetchAllProvider
-     */
-    public function testFetchingAllRowsSavesCache(callable $fetchAll): void
-    {
-        $layerCache = new ArrayAdapter();
-
-        $result = $this->connection->executeQuery(
-            'SELECT * FROM caching WHERE test_int > 500',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey', $layerCache)
-        );
-
-        $fetchAll($result);
-
-        self::assertCount(1, $layerCache->getItem('testcachekey')->get());
-    }
-
-    /**
-     * @return iterable<string,list<mixed>>
-     */
-    public static function fetchAllProvider(): iterable
-    {
-        yield 'fetchAllAssociative' => [
-            static function (Result $result): void {
-                $result->fetchAllAssociative();
-            },
-        ];
-
-        yield 'fetchAllNumeric' => [
-            static function (Result $result): void {
-                $result->fetchAllNumeric();
-            },
-        ];
-
-        yield 'fetchFirstColumn' => [
-            static function (Result $result): void {
-                $result->fetchFirstColumn();
-            },
-        ];
-    }
-
-    public function testFetchColumn(): void
-    {
-        $query = $this->connection->getDatabasePlatform()
-            ->getDummySelectSQL('1');
-
-        $qcp = new QueryCacheProfile(0, null, new ArrayAdapter());
-
-        $result = $this->connection->executeCacheQuery($query, [], [], $qcp);
-        $result->fetchFirstColumn();
-
-        $query = $this->connection->executeCacheQuery($query, [], [], $qcp);
-
-        self::assertEquals([1], $query->fetchFirstColumn());
-    }
-
-    /**
-     * @param list<mixed> $expectedResult
-     */
-    private function assertCacheNonCacheSelectSameFetchModeAreEqual(array $expectedResult, callable $fetchMode): void
-    {
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        self::assertEquals(2, $stmt->columnCount());
-        $data = $this->hydrateViaIteration($stmt, $fetchMode);
-        self::assertEquals($expectedResult, $data);
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching ORDER BY test_int ASC',
-            [],
-            [],
-            new QueryCacheProfile(0, 'testcachekey')
-        );
-
-        self::assertEquals(2, $stmt->columnCount());
-        $data = $this->hydrateViaIteration($stmt, $fetchMode);
-        self::assertEquals($expectedResult, $data);
-        self::assertCount(1, $this->sqlLogger->queries, 'Only one query has hit the database.');
-    }
-
-    public function testEmptyResultCache(): void
-    {
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching WHERE test_int > 500',
-            [],
-            [],
-            new QueryCacheProfile(10, 'emptycachekey')
-        );
-
-        $this->hydrateViaIteration($stmt, static function (Result $result) {
-            return $result->fetchAssociative();
-        });
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching WHERE test_int > 500',
-            [],
-            [],
-            new QueryCacheProfile(10, 'emptycachekey')
-        );
-
-        $this->hydrateViaIteration($stmt, static function (Result $result) {
-            return $result->fetchAssociative();
-        });
-
-        self::assertCount(1, $this->sqlLogger->queries, 'Only one query has hit the database.');
-    }
-
-    public function testChangeCacheImpl(): void
-    {
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching WHERE test_int > 500',
-            [],
-            [],
-            new QueryCacheProfile(10, 'emptycachekey')
-        );
-
-        $this->hydrateViaIteration($stmt, static function (Result $result) {
-            return $result->fetchAssociative();
-        });
-
-        $secondCache = new ArrayAdapter();
-
-        $stmt = $this->connection->executeQuery(
-            'SELECT * FROM caching WHERE test_int > 500',
-            [],
-            [],
-            new QueryCacheProfile(10, 'emptycachekey', $secondCache)
-        );
-
-        $this->hydrateViaIteration($stmt, static function (Result $result) {
-            return $result->fetchAssociative();
-        });
-
-        self::assertCount(2, $this->sqlLogger->queries, 'Two queries have hit the database.');
-        self::assertCount(1, $secondCache->getItem('emptycachekey')->get());
-    }
-
-    /**
-     * @return iterable<string,array<int,mixed>>
-     */
-    public static function fetchProvider(): iterable
-    {
-        yield 'associative' => [
-            static function (Result $result) {
-                return $result->fetchAssociative();
-            },
-            static function (Result $result): array {
-                return $result->fetchAllAssociative();
-            },
-        ];
-
-        yield 'numeric' => [
-            static function (Result $result) {
-                return $result->fetchNumeric();
-            },
-            static function (Result $result): array {
-                return $result->fetchAllNumeric();
-            },
-        ];
-
-        yield 'column' => [
-            static function (Result $result) {
-                return $result->fetchOne();
-            },
-            static function (Result $result): array {
-                return $result->fetchFirstColumn();
-            },
-        ];
-    }
-
-    /**
-     * @return array<int, mixed>
-     */
-    private function hydrateViaFetchAll(Result $result, callable $fetchAll): array
-    {
-        $data = [];
-
-        foreach ($fetchAll($result) as $row) {
-            $data[] = is_array($row) ? array_change_key_case($row, CASE_LOWER) : $row;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @return array<int, mixed>
-     */
-    private function hydrateViaIteration(Result $result, callable $fetch): array
-    {
-        $data = [];
-
-        while (($row = $fetch($result)) !== false) {
-            $data[] = is_array($row) ? array_change_key_case($row, CASE_LOWER) : $row;
-        }
-
-        return $data;
-    }
-}