diff --git a/src/server.c b/src/server.c
index 4b87b6ac2a10de0d3cb395ac55f17a9f248de1e7..bb891594b4f098504d479f57b08979487fbb6e1e 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3194,6 +3194,7 @@ void call(client *c, int flags) {
         latencyAddSampleIfNeeded(latency_event,duration/1000);
         slowlogPushEntryIfNeeded(c,c->argv,c->argc,duration);
     }
+
     if (flags & CMD_CALL_STATS) {
         /* use the real command that was executed (cmd and lastamc) may be
          * different, in case of MULTI-EXEC or re-written commands such as
@@ -3261,6 +3262,16 @@ void call(client *c, int flags) {
         redisOpArrayFree(&server.also_propagate);
     }
     server.also_propagate = prev_also_propagate;
+
+    /* If the client has keys tracking enabled for client side caching,
+     * make sure to remember the keys it fetched via this command. */
+    if (c->cmd->flags & CMD_READONLY) {
+        client *caller = (c->flags & CLIENT_LUA && server.lua_caller) ?
+                            server.lua_caller : c;
+        if (caller->flags & CLIENT_TRACKING)
+            trackingRememberKeys(caller);
+    }
+
     server.stat_numcommands++;
 }
 
diff --git a/src/server.h b/src/server.h
index 8c97f83f6418f35daf2f03a29d0f0440e314f805..022e48304d24b939e48a49b0cbc9b15702b38033 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1617,6 +1617,7 @@ void addReplyStatusFormat(client *c, const char *fmt, ...);
 /* Client side caching (tracking mode) */
 void enableTracking(client *c, uint64_t redirect_to);
 void disableTracking(client *c);
+void trackingRememberKeys(client *c);
 
 /* List data type */
 void listTypeTryConversion(robj *subject, robj *value);