diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 3fe7aae4cd..6eefbe508b 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -794,6 +794,10 @@ void FOOTPRINT_EDIT_FRAME::initLibraryTree()
     FP_LIB_TABLE*   fpTable = Prj().PcbFootprintLibs();
 
     WX_PROGRESS_REPORTER progressReporter( this, _( "Loading Footprint Libraries" ), 2 );
+    if( GFootprintList.GetCount() == 0 )
+    {
+        GFootprintList.ReadCacheFromFile( Prj().GetProjectPath() + "fp-info-cache" );
+    }
     GFootprintList.ReadFootprintFiles( fpTable, NULL, &progressReporter );
     progressReporter.Show( false );