diff --git a/src/Db/CachedArray.php b/src/Db/CachedArray.php
new file mode 100644
index 000000000..e20930a07
--- /dev/null
+++ b/src/Db/CachedArray.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types=1);
+
+namespace danog\MadelineProto\Db;
+
+use AssertionError;
+use danog\AsyncOrm\DbArray;
+use danog\AsyncOrm\DbArrayBuilder;
+use danog\AsyncOrm\Internal\Containers\CacheContainer;
+
+/**
+ * @internal
+ * @deprecated Please use https://github.com/danog/AsyncOrm
+ */
+final class CachedArray extends DbArray
+{
+    private readonly CacheContainer $cache;
+
+    public function unset(string|int $key): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function set(string|int $key, mixed $value): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function get(string|int $key): mixed
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function clear(): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function count(): int
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function getIterator(): \Traversable
+    {
+        throw new AssertionError("Unreachable");
+    }
+
+    public static function getInstance(DbArrayBuilder $config, DbArray|null $previous): DbArray
+    {
+        throw new AssertionError("Unreachable");
+    }
+
+}
diff --git a/src/Db/MemoryArray.php b/src/Db/MemoryArray.php
new file mode 100644
index 000000000..28c526ac3
--- /dev/null
+++ b/src/Db/MemoryArray.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+namespace danog\MadelineProto\Db;
+
+use ArrayObject;
+use AssertionError;
+use danog\AsyncOrm\DbArray;
+use danog\AsyncOrm\DbArrayBuilder;
+
+/**
+ * @internal
+ * @deprecated Please use https://github.com/danog/AsyncOrm
+ */
+final class MemoryArray extends ArrayObject
+{
+    public function unset(string|int $key): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function set(string|int $key, mixed $value): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function get(string|int $key): mixed
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function clear(): void
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function count(): int
+    {
+        throw new AssertionError("Unreachable");
+    }
+    public function getIterator(): \Iterator
+    {
+        throw new AssertionError("Unreachable");
+    }
+
+    public static function getInstance(DbArrayBuilder $config, DbArray|null $previous): DbArray
+    {
+        throw new AssertionError("Unreachable");
+    }
+}
diff --git a/src/polyfill.php b/src/polyfill.php
index 57c183a4f..d75ac6af6 100644
--- a/src/polyfill.php
+++ b/src/polyfill.php
@@ -6,10 +6,6 @@ if (class_exists('\\danog\\MadelineProto\\Db\\NullCache\\MysqlArray')) {
     return;
 }
 
-use ArrayObject;
-use AssertionError;
-use danog\AsyncOrm\DbArray;
-use danog\AsyncOrm\DbArrayBuilder;
 use danog\AsyncOrm\Internal\Containers\CacheContainer;
 use danog\AsyncOrm\Internal\Driver\MysqlArray;
 use danog\AsyncOrm\Internal\Driver\PostgresArray;
@@ -25,77 +21,6 @@ class_alias(PostgresArray::class, '\\danog\\MadelineProto\\Db\\PostgresArrayByte
 class_alias(RedisArray::class, '\\danog\\MadelineProto\\Db\\RedisArray');
 class_alias(CacheContainer::class, '\\danog\\MadelineProto\\Db\\CacheContainer');
 
-/** @deprecated */
-final class MemoryArray extends ArrayObject
-{
-    public function unset(string|int $key): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function set(string|int $key, mixed $value): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function get(string|int $key): mixed
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function clear(): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function count(): int
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function getIterator(): \Iterator
-    {
-        throw new AssertionError("Unreachable");
-    }
-
-    public static function getInstance(DbArrayBuilder $config, DbArray|null $previous): DbArray
-    {
-        throw new AssertionError("Unreachable");
-    }
-}
-/** @deprecated */
-final class CachedArray extends DbArray
-{
-
-    private readonly CacheContainer $cache;
-
-    public function unset(string|int $key): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function set(string|int $key, mixed $value): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function get(string|int $key): mixed
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function clear(): void
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function count(): int
-    {
-        throw new AssertionError("Unreachable");
-    }
-    public function getIterator(): \Traversable
-    {
-        throw new AssertionError("Unreachable");
-    }
-
-    public static function getInstance(DbArrayBuilder $config, DbArray|null $previous): DbArray
-    {
-        throw new AssertionError("Unreachable");
-    }
-
-}
-
 if ((PHP_MINOR_VERSION === 2 && PHP_VERSION_ID < 80204)
     || PHP_MAJOR_VERSION < 8
     || (PHP_MAJOR_VERSION === 8 && PHP_MINOR_VERSION < 2)