Merge branch 'cache' into bookmarks

Conflicts:
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 2f690e7,85379c6..5c75498
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -283,7 -289,10 +286,9 @@@ Settings* XdxfPlugin::settings() 
      return _settings;
  }
  
 -bool XdxfPlugin::isCached()
 -{
 +bool XdxfPlugin::isCached() {
+     if(_settings->value("cached") == "true")
+         return true;
      return false;
  }