diff --git a/include/items.php b/include/items.php
index 36611dbffa..8bb981b6de 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1499,7 +1499,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 	}
 
-	create_tags_from_item($current_post, $dontcache);
+	create_tags_from_item($current_post);
 	create_files_from_item($current_post);
 
 	// Only check for notifications on start posts
@@ -4668,8 +4668,8 @@ function drop_item($id,$interactive = true) {
 				dbesc($item['parent-uri']),
 				intval($item['uid'])
 			);
-			create_tags_from_item($item['parent-uri'], $item['uid']);
-			create_files_from_item($item['parent-uri'], $item['uid']);
+			create_tags_from_itemuri($item['parent-uri'], $item['uid']);
+			create_files_from_itemuri($item['parent-uri'], $item['uid']);
 			delete_thread_uri($item['parent-uri'], $item['uid']);
 			// ignore the result
 		}
diff --git a/include/tags.php b/include/tags.php
index 05e11b47ed..489ca47d2b 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,5 +1,5 @@
 <?php
-function create_tags_from_item($itemid, $dontcache = false) {
+function create_tags_from_item($itemid) {
 	global $a;
 
 	$profile_base = $a->get_baseurl();
@@ -26,18 +26,6 @@ function create_tags_from_item($itemid, $dontcache = false) {
 	if ($message["deleted"])
 		return;
 
-	if (!$dontcache) {
-		$cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body']));
-
-		if (($cachefile != '') AND !file_exists($cachefile)) {
-			$s = prepare_text($message['body']);
-			$stamp1 = microtime(true);
-			file_put_contents($cachefile, $s);
-			$a->save_timestamp($stamp1, "file");
-			logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
-		}
-	}
-
 	$taglist = explode(",", $message["tag"]);
 
 	$tags = "";