diff --git a/src/worker/windows/subscription.cpp b/src/worker/windows/subscription.cpp
index 4e3909d8..30098748 100644
--- a/src/worker/windows/subscription.cpp
+++ b/src/worker/windows/subscription.cpp
@@ -33,7 +33,8 @@ Subscription::Subscription(ChannelID channel,
   recursive{recursive},
   buffer_size{DEFAULT_BUFFER_SIZE},
   buffer{new BYTE[buffer_size]},
-  written{new BYTE[buffer_size]}
+  written{new BYTE[buffer_size]},
+  old_path_seen{false}
 {
   ZeroMemory(&overlapped, sizeof(OVERLAPPED));
   overlapped.hEvent = this;
diff --git a/src/worker/windows/subscription.h b/src/worker/windows/subscription.h
index 5cde3ed2..fc1b5100 100644
--- a/src/worker/windows/subscription.h
+++ b/src/worker/windows/subscription.h
@@ -4,6 +4,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include "../../message.h"
 #include "../../result.h"
@@ -43,6 +44,26 @@ class Subscription
 
   const bool &is_terminating() const { return terminating; }
 
+  void remember_old_path(std::string &&old_path, EntryKind kind)
+  {
+    this->old_path = std::move(old_path);
+    this->old_path_kind = kind;
+    this->old_path_seen = true;
+  }
+
+  void clear_old_path()
+  {
+    old_path.clear();
+    old_path_kind = KIND_UNKNOWN;
+    old_path_seen = false;
+  }
+
+  const std::string &get_old_path() const { return old_path; }
+
+  const EntryKind &get_old_path_kind() const { return old_path_kind; }
+
+  const bool &was_old_path_seen() const { return old_path_seen; }
+
 private:
   CommandID command;
   ChannelID channel;
@@ -57,6 +78,10 @@ class Subscription
   DWORD buffer_size;
   std::unique_ptr<BYTE[]> buffer;
   std::unique_ptr<BYTE[]> written;
+
+  std::string old_path;
+  EntryKind old_path_kind;
+  bool old_path_seen;
 };
 
 #endif
diff --git a/src/worker/windows/windows_worker_platform.cpp b/src/worker/windows/windows_worker_platform.cpp
index a810c93b..0edf53e5 100644
--- a/src/worker/windows/windows_worker_platform.cpp
+++ b/src/worker/windows/windows_worker_platform.cpp
@@ -221,14 +221,12 @@ class WindowsWorkerPlatform : public WorkerPlatform
     MessageBuffer buffer;
     ChannelMessageBuffer messages(buffer, channel);
     size_t num_events = 0;
-    bool old_path_seen = false;
-    string old_path;
 
     while (true) {
       PFILE_NOTIFY_INFORMATION info = reinterpret_cast<PFILE_NOTIFY_INFORMATION>(base);
       num_events++;
 
-      Result<> pr = process_event_payload(info, sub, messages, old_path_seen, old_path);
+      Result<> pr = process_event_payload(info, sub, messages);
       if (pr.is_error()) {
         LOGGER << "Skipping entry " << pr << "." << endl;
       }
@@ -307,11 +305,7 @@ class WindowsWorkerPlatform : public WorkerPlatform
     return out;
   }
 
-  Result<> process_event_payload(PFILE_NOTIFY_INFORMATION info,
-    Subscription *sub,
-    ChannelMessageBuffer &messages,
-    bool &old_path_seen,
-    string &old_path)
+  Result<> process_event_payload(PFILE_NOTIFY_INFORMATION info, Subscription *sub, ChannelMessageBuffer &messages)
   {
     ChannelID channel = sub->get_channel();
     wstring relpathw{info->FileName, info->FileNameLength / sizeof(WCHAR)};
@@ -335,25 +329,47 @@ class WindowsWorkerPlatform : public WorkerPlatform
     }
     EntryKind kind = stat->get_entry_kind();
 
+    ostream &logline = LOGGER;
+    logline << "Event at [" << path << "] ";
+
     switch (info->Action) {
-      case FILE_ACTION_ADDED: messages.created(move(path), kind); break;
-      case FILE_ACTION_MODIFIED: messages.modified(move(path), kind); break;
-      case FILE_ACTION_REMOVED: messages.deleted(move(path), kind); break;
+      case FILE_ACTION_ADDED:
+        logline << "FILE_ACTION_ADDED " << kind << "." << endl;
+        messages.created(move(path), kind);
+        break;
+      case FILE_ACTION_MODIFIED:
+        logline << "FILE_ACTION_MODIFIED " << kind << "." << endl;
+        messages.modified(move(path), kind);
+        break;
+      case FILE_ACTION_REMOVED:
+        logline << "FILE_ACTION_REMOVED " << kind << "." << endl;
+        messages.deleted(move(path), kind);
+        break;
       case FILE_ACTION_RENAMED_OLD_NAME:
-        old_path_seen = true;
-        old_path = move(path);
+        logline << "FILE_ACTION_RENAMED_OLD_NAME " << kind << "." << endl;
+        sub->remember_old_path(move(path), kind);
         break;
       case FILE_ACTION_RENAMED_NEW_NAME:
-        if (old_path_seen) {
+        logline << "FILE_ACTION_RENAMED_NEW_NAME ";
+        if (sub->was_old_path_seen()) {
           // Old name received first
-          messages.renamed(move(old_path), move(path), kind);
-          old_path_seen = false;
+          if (kind == KIND_UNKNOWN) {
+            kind = sub->get_old_path_kind();
+          }
+
+          logline << kind << "." << endl;
+          cache.update_for_rename(sub->get_old_path(), path);
+          messages.renamed(string(sub->get_old_path()), move(path), kind);
+          sub->clear_old_path();
         } else {
           // No old name. Treat it as a creation
+          logline << "(unpaired) " << kind << "." << endl;
           messages.created(move(path), kind);
         }
         break;
       default:
+        logline << " with unexpected action " << info->Action << "." << endl;
+
         ostringstream out;
         out << "Unexpected action " << info->Action << " reported by ReadDirectoryChangesW for " << path;
         return error_result(out.str());
diff --git a/test/events/kind-change.test.js b/test/events/kind-change.test.js
index a8ee6b5d..6c6ce3d7 100644
--- a/test/events/kind-change.test.js
+++ b/test/events/kind-change.test.js
@@ -135,7 +135,7 @@ const {EventMatcher} = require('../matcher');
       await fs.mkdir(reusedPath)
 
       await until('delete and create events arrive', matcher.allEvents(
-        {action: 'deleted', kind: 'file', path: reusedPath},
+        {action: 'deleted', path: reusedPath},
         {action: 'created', kind: 'directory', path: reusedPath}
       ))
     })