diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c
index b904f74d1f..ef13245567 100644
--- a/legacy/efreet/src/lib/efreet_cache.c
+++ b/legacy/efreet/src/lib/efreet_cache.c
@@ -5,6 +5,7 @@
 /* TODO: Consider flushing local icons cache after idling.
  *       Icon requests will probably come in batches, f.ex. during menu
  *       browsing.
+ * TODO: Retry closing desktop cache on dangling references.
  */
 
 #include <libgen.h>
@@ -864,6 +865,7 @@ efreet_cache_desktop_add(Efreet_Desktop *desktop)
         for (i = 0; i < arr->array_count; i++)
         {
             /* Check if we already have this dir in cache */
+            /* TODO: Need to check if p is a subdir */
             if (!strcmp(p, arr->array[i]))
                 return;
         }
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c
index 90a69f8950..dd11b0388b 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/legacy/efreet/src/lib/efreet_desktop.c
@@ -1188,6 +1188,7 @@ efreet_desktop_changes_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED
 {
     const char *ext;
 
+    /* TODO: If we get a stale symlink, we need to rerun cache creation */
     switch (event)
     {
         case ECORE_FILE_EVENT_NONE:
diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c
index 3ac3c442ae..6b8849dfe4 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/legacy/efreet/src/lib/efreet_icon.c
@@ -953,6 +953,7 @@ static void
 efreet_icon_changes_cb(void *data __UNUSED__, Ecore_File_Monitor *em __UNUSED__,
                        Ecore_File_Event event, const char *path)
 {
+    /* TODO: If we get a stale symlink, we need to rerun cache creation */
     switch (event)
     {
         case ECORE_FILE_EVENT_NONE: