diff --git a/library/think/Model.php b/library/think/Model.php
index cb7bd21f..e4306697 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -985,6 +985,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      */
     public static function get($data = null, $with = [], $cache = false)
     {
+        if (!$cache && $data && is_scalar($data)) {
+            $cache = true;
+        }
         $query = static::parseQuery($data, $with, $cache);
         return $query->find($data);
     }
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 3a687f13..a3e8ac2e 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1768,8 +1768,8 @@ class Query
     public function update(array $data)
     {
         $options = $this->parseExpress();
+        $pk      = $this->getPk($options);
         if (empty($options['where'])) {
-            $pk = $this->getPk($options);
             // 如果存在主键数据 则自动作为更新条件
             if (is_string($pk) && isset($data[$pk])) {
                 $where[$pk] = $data[$pk];
@@ -1793,6 +1793,8 @@ class Query
             } else {
                 $options['where']['AND'] = $where;
             }
+        } elseif (is_string($pk) && isset($options['where']['AND'][$pk]) && is_scalar($options['where']['AND'][$pk])) {
+            $key = 'think:' . $options['table'] . '|' . $options['where']['AND'][$pk];
         }
         // 生成UPDATE SQL语句
         $sql = $this->builder()->update($data, $options);