diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 80e3ed2ec..7e1b16cc4 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -204,6 +204,12 @@
       <code>$cacheTtl</code>
     </PropertyNotSetInConstructor>
   </file>
+  <file src="src/Db/CachedArray.php">
+    <LessSpecificImplementedReturnType>
+      <code>Traversable</code>
+      <code>Traversable</code>
+    </LessSpecificImplementedReturnType>
+  </file>
   <file src="src/Db/DbArrayTrait.php">
     <InvalidArgument>
       <code>$index</code>
@@ -244,6 +250,9 @@
       <code>$settings</code>
       <code>$settings</code>
     </ArgumentTypeCoercion>
+    <MethodSignatureMismatch>
+      <code>DriverArray</code>
+    </MethodSignatureMismatch>
     <MissingClosureParamType>
       <code>$v</code>
       <code>$value</code>
diff --git a/src/Db/DriverArray.php b/src/Db/DriverArray.php
index c1ce46070..de197b1fd 100644
--- a/src/Db/DriverArray.php
+++ b/src/Db/DriverArray.php
@@ -16,13 +16,11 @@
 
 namespace danog\MadelineProto\Db;
 
-use Closure;
 use danog\MadelineProto\Logger;
 use danog\MadelineProto\Magic;
 use danog\MadelineProto\Settings\Database\DriverDatabaseAbstract;
 use danog\MadelineProto\Settings\Database\SerializerType;
 use danog\MadelineProto\Settings\DatabaseAbstract;
-use Exception;
 use IteratorAggregate;
 
 use function Amp\async;
diff --git a/src/InternalDoc.php b/src/InternalDoc.php
index 58aac98fb..9f4fd6e68 100644
--- a/src/InternalDoc.php
+++ b/src/InternalDoc.php
@@ -446,6 +446,18 @@ abstract class InternalDoc
     {
         return $this->wrapper->getAPI()->downloadToResponse($messageMedia, $request, $cb, $size, $mime, $name);
     }
+    /**
+     * Download file to an amphp stream, returning it.
+     *
+     * @param mixed                       $messageMedia File to download
+     * @param callable                    $cb            Callback
+     * @param int                         $offset        Offset where to start downloading
+     * @param int                         $end           Offset where to end download
+     */
+    public function downloadToReturnedStream(mixed $messageMedia, ?callable $cb = null, int $offset = 0, int $end = -1): \Amp\ByteStream\ReadableStream
+    {
+        return $this->wrapper->getAPI()->downloadToReturnedStream($messageMedia, $cb, $offset, $end);
+    }
     /**
      * Download file to stream.
      *
diff --git a/src/MTProtoTools/FilesLogic.php b/src/MTProtoTools/FilesLogic.php
index 3f44694fc..c8cac5315 100644
--- a/src/MTProtoTools/FilesLogic.php
+++ b/src/MTProtoTools/FilesLogic.php
@@ -124,6 +124,27 @@ trait FilesLogic
             $this->downloadToStream($messageMedia, \fopen('php://output', 'w'), $cb, ...$result->getServeRange());
         }
     }
+    /**
+     * Download file to an amphp stream, returning it.
+     *
+     * @param mixed                       $messageMedia File to download
+     * @param callable                    $cb            Callback
+     * @param int                         $offset        Offset where to start downloading
+     * @param int                         $end           Offset where to end download
+     */
+    public function downloadToReturnedStream(mixed $messageMedia, ?callable $cb = null, int $offset = 0, int $end = -1): ReadableStream
+    {
+        $pipe = new Pipe(1024*1024);
+        $sink = $pipe->getSink();
+        EventLoop::queue(function () use ($messageMedia, $sink, $cb, $offset, $end): void {
+            try {
+                $this->downloadToStream($messageMedia, $sink, $cb, $offset, $end);
+            } finally {
+                $sink->close();
+            }
+        });
+        return $pipe->getSource();
+    }
     /**
      * Download file to stream.
      *