diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
index bba16abfd..7f1a20f7a 100644
--- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
+++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
@@ -230,12 +230,15 @@ CMakeSetupGUIImplementation
 
   if( m_WhereBuild != expandedAbsolutePath )
   {
-    m_BuildPathChanged = true;
-    m_WhereBuild = expandedAbsolutePath;
+    m_BuildPathChanged  = true;
+    m_WhereBuild        = expandedAbsolutePath;
+    LoadCacheFromDiskToGUI();
+  }
+  else 
+  {
+    m_BuildPathChanged = false;
   }
   
-  LoadCacheFromDiskToGUI();
-
   return true;
 
 }
diff --git a/Source/FLTKDialog/FLTKPropertyItemRow.cxx b/Source/FLTKDialog/FLTKPropertyItemRow.cxx
index 6afba11ba..3c6f591c0 100644
--- a/Source/FLTKDialog/FLTKPropertyItemRow.cxx
+++ b/Source/FLTKDialog/FLTKPropertyItemRow.cxx
@@ -229,8 +229,7 @@ NameButtonCallback( Fl_Widget * widget, void * data)
         delete parentGroup;  // Patricide... ?
         // Redraw the list
         grandParentGroup->redraw();
-        
-
+        FillCacheManagerFromCacheGUI();        
         return;
       }
       break;
@@ -244,11 +243,11 @@ NameButtonCallback( Fl_Widget * widget, void * data)
 
 void
 PropertyItemRow::
-SaveCacheFromGUI( void )
+FillCacheManagerFromCacheGUI( void )
 {
   if( m_CMakeSetup )
   {
-    m_CMakeSetup->SaveCacheFromGUI();
+    m_CMakeSetup->FillCacheManagerFromCacheGUI();
   }
 }
 
@@ -275,6 +274,7 @@ CheckButtonCallback( Fl_Widget * widget, void * data)
   }
   button->redraw();
   
+  FillCacheManagerFromCacheGUI();
 
 }
 
@@ -289,6 +289,7 @@ InputTextCallback(   Fl_Widget * widget, void * data)
   
   item->m_curValue      = input->value();
 
+  FillCacheManagerFromCacheGUI();
 
 }
 
@@ -321,6 +322,7 @@ ColorSelectionCallback(   Fl_Widget * widget, void * data)
 
   colorButton->redraw();
  
+  FillCacheManagerFromCacheGUI();
 
 }
 
@@ -346,6 +348,7 @@ BrowsePathCallback(   Fl_Widget * widget, void * data)
     inputText->value( newpath );
   }
 
+  FillCacheManagerFromCacheGUI();
 
 }
 
diff --git a/Source/FLTKDialog/FLTKPropertyItemRow.h b/Source/FLTKDialog/FLTKPropertyItemRow.h
index e72d50173..aee399859 100644
--- a/Source/FLTKDialog/FLTKPropertyItemRow.h
+++ b/Source/FLTKDialog/FLTKPropertyItemRow.h
@@ -50,11 +50,11 @@ class PropertyItemRow  : public Fl_Tile
     static void BrowsePathCallback(  Fl_Widget *, void *);
     static void ColorSelectionCallback(   Fl_Widget * widget, void * data);
 
+    static void FillCacheManagerFromCacheGUI( void );
 
   public:
     
     static void SetCMakeSetupGUI( CMakeSetupGUIImplementation * );
-    static void SaveCacheFromGUI( void );
 };