diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 31cc0cf44a..58e9d0d60c 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -35,6 +35,7 @@ Yii Framework 2 Change Log
 - Bug #6164: Added missing support for `yii\db\Expression` to QueryBuilder `BETWEEN` and `LIKE` conditions (cebe)
 - Bug #6236: No JS scripts should be registered when `yii\widgets\ActiveForm::enableClientScript` is false (qiangxue)
 - Bug #6266: Clicking on reset button does not hide error summary when using `ActiveForm` (InteLigent, qiangxue)
+- Bug #6271: Query caching returns the same data when running the same SQL with different fetch modes (grachov)
 - Bug: Gii console command help information does not contain global options (qiangxue)
 - Bug: `yii\web\UrlRule` was unable to create URLs for rules containing unicode characters (samdark)
 - Bug: `yii\web\AssetManager` should not publish disabled asset bundles (qiangxue)
diff --git a/framework/db/Command.php b/framework/db/Command.php
index ceac158544..5a3fe2053b 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -799,6 +799,7 @@ class Command extends Component
                 $cacheKey = [
                     __CLASS__,
                     $method,
+                    $fetchMode,
                     $this->db->dsn,
                     $this->db->username,
                     $rawSql,