diff --git a/ChangeLog b/ChangeLog
index c160d056..7e7ed058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
+CHANGES IN WAF 2.1
+------------------
++ Added wafcache
 - Remove waflib.Runner.PriorityTasks.appendleft
 - Remove waflib.Task.TaskBase
-- Remove the upper class of waflib.Task.Task (metaclasses)
+- Remove the upper class of waflib.Task.Task (metaclass syntax)
 
 NEW IN WAF 2.0.19
 -----------------
diff --git a/waflib/extras/wafcache.py b/waflib/Tools/wafcache.py
similarity index 100%
rename from waflib/extras/wafcache.py
rename to waflib/Tools/wafcache.py