diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c
index 56ff80915..c142dcc8d 100644
--- a/src/cache/ftcimage.c
+++ b/src/cache/ftcimage.c
@@ -34,11 +34,7 @@
     FT_Memory  memory = cache->memory;
 
 
-    if ( inode->glyph )
-    {
-      FT_Done_Glyph( inode->glyph );
-      inode->glyph = NULL;
-    }
+    FT_Done_Glyph( inode->glyph );
 
     FTC_GNode_Done( FTC_GNODE( inode ), cache );
     FT_FREE( inode );
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index c73601400..29a95baa1 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -448,18 +448,13 @@
       {
         cache->clazz.cache_done( cache );
         FT_FREE( cache );
-        manager->caches[idx] = NULL;
       }
     }
-    manager->num_caches = 0;
 
     /* discard faces and sizes */
     FTC_MruList_Done( &manager->sizes );
     FTC_MruList_Done( &manager->faces );
 
-    manager->library = NULL;
-    manager->memory  = NULL;
-
     FT_FREE( manager );
   }