diff --git a/boot/boot.js b/boot/boot.js
index 85f9b449b..d5e0a63e8 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1083,6 +1083,8 @@ $tw.Wiki = function(options) {
 				});
 			}
 		});
+		this.clearCache(null);
+		this.clearGlobalCache();
 	};
 
 };
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 234ba26d8..c2c0e22a2 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -742,11 +742,15 @@ exports.getCacheForTiddler = function(title,cacheName,initializer) {
 	}
 };
 
-// Clear all caches associated with a particular tiddler
+// Clear all caches associated with a particular tiddler, or, if the title is null, clear all the caches for all the tiddlers
 exports.clearCache = function(title) {
-	this.caches = this.caches || Object.create(null);
-	if($tw.utils.hop(this.caches,title)) {
-		delete this.caches[title];
+	if(title) {
+		this.caches = this.caches || Object.create(null);
+		if($tw.utils.hop(this.caches,title)) {
+			delete this.caches[title];
+		}
+	} else {
+		this.caches = Object.create(null);
 	}
 };