diff --git a/.gitsubprojects b/.gitsubprojects
index 1384b55..a6d1c67 100644
--- a/.gitsubprojects
+++ b/.gitsubprojects
@@ -1,5 +1,6 @@
 # -*- mode: cmake -*-
 git_subproject(Servus https://github.com/HBPVIS/Servus.git 001588d)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 09b5ca1)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 640cd69)
+git_subproject(Keyv https://github.com/BlueBrain/Keyv.git 8fd5f9d)
 git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git caa86d8)
 git_subproject(MVDTool https://github.com/BlueBrain/MVDTool.git fa7523e)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08c4ea1..82b6ef7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ common_find_package(Boost REQUIRED COMPONENTS
   date_time filesystem program_options regex system thread unit_test_framework)
 common_find_package(Boost COMPONENTS python${USE_BOOST_PYTHON_VERSION})
 common_find_package(HDF5 SYSTEM REQUIRED COMPONENTS C CXX)
+common_find_package(Keyv REQUIRED)
 common_find_package(Lunchbox REQUIRED)
 common_find_package(MVDTool)
 common_find_package(NumPy 1.7)
diff --git a/brain/CMakeLists.txt b/brain/CMakeLists.txt
index 527c4a5..48adaf1 100644
--- a/brain/CMakeLists.txt
+++ b/brain/CMakeLists.txt
@@ -43,7 +43,7 @@ set(BRAIN_SOURCES
 )
 
 set(BRAIN_PUBLIC_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-set(BRAIN_LINK_LIBRARIES PUBLIC Brion vmmlib)
+set(BRAIN_LINK_LIBRARIES PUBLIC Brion vmmlib PRIVATE Keyv)
 set(BRAIN_INCLUDE_NAME brain)
 set(BRAIN_NAMESPACE brain)
 
diff --git a/brain/detail/circuit.h b/brain/detail/circuit.h
index 1ae2b5c..3a0b557 100644
--- a/brain/detail/circuit.h
+++ b/brain/detail/circuit.h
@@ -30,10 +30,10 @@
 #include <brion/detail/lockHDF5.h>
 #include <brion/detail/silenceHDF5.h>
 
+#include <keyv/Map.h>
 #include <lunchbox/lock.h>
 #include <lunchbox/lockable.h>
 #include <lunchbox/log.h>
-#include <lunchbox/persistentMap.h>
 #include <lunchbox/scopedMutex.h>
 
 #ifdef BRAIN_USE_MVD3
@@ -148,7 +148,7 @@ class Circuit::Impl
         , _morphologySource( config.getMorphologySource( ))
         , _synapseSource( config.getSynapseSource( ))
         , _targetSources( config.getTargetSources( ))
-        , _cache( lunchbox::PersistentMap::createCache( ))
+        , _cache( keyv::Map::createCache( ))
     {
     }
 
@@ -386,7 +386,7 @@ class Circuit::Impl
     const brion::URI _synapseSource;
     const brion::URIs _targetSources;
     mutable brion::Targets _targetParsers;
-    mutable lunchbox::PersistentMapPtr _cache;
+    mutable keyv::MapPtr _cache;
 
     template< typename T >
     using LockPtr = lunchbox::Lockable< std::unique_ptr< T >>;
diff --git a/brion/CMakeLists.txt b/brion/CMakeLists.txt
index 4c4dc61..2f025ca 100644
--- a/brion/CMakeLists.txt
+++ b/brion/CMakeLists.txt
@@ -75,20 +75,12 @@ if(MSVC)
 endif()
 
 set(BRION_PUBLIC_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
-set(BRION_LINK_LIBRARIES PUBLIC Lunchbox Servus vmmlib
-                         PRIVATE ${Boost_SYSTEM_LIBRARIES}
-                                 ${Boost_FILESYSTEM_LIBRARIES}
-                                 ${Boost_DATE_TIME_LIBRARIES}
-                                 ${Boost_REGEX_LIBRARIES}
-                                 ${Boost_THREAD_LIBRARIES}
-                                 ${HDF5_LIBRARIES}
-                                 ${CMAKE_THREADS_LIB_INIT}
+set(BRION_LINK_LIBRARIES
+  PUBLIC Lunchbox Servus vmmlib
+  PRIVATE Keyv
+  ${Boost_SYSTEM_LIBRARIES} ${Boost_FILESYSTEM_LIBRARIES}
+  ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${Boost_THREAD_LIBRARIES}
+  ${HDF5_LIBRARIES} ${CMAKE_THREADS_LIB_INIT}
 )
 
 common_library(Brion)
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
-  # WAR gcc 4.4 bug on BlueGene
-  set_property(SOURCE mesh.cpp APPEND_STRING PROPERTY
-    COMPILE_FLAGS "-Wno-uninitialized")
-endif()
diff --git a/brion/plugin/compartmentReportMap.cpp b/brion/plugin/compartmentReportMap.cpp
index c2d627d..0e57ca8 100644
--- a/brion/plugin/compartmentReportMap.cpp
+++ b/brion/plugin/compartmentReportMap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, EPFL/Blue Brain Project
+/* Copyright (c) 2014-2016, EPFL/Blue Brain Project
  *                          Stefan.Eilemann@epfl.ch
  *
  * This file is part of Brion <https://github.com/BlueBrain/Brion>
@@ -108,8 +108,8 @@ CompartmentReportMap::~CompartmentReportMap()
 
 bool CompartmentReportMap::handles(const CompartmentReportInitData& initData )
 {
-    return lunchbox::PersistentMap::handles( initData.getURI() )
-            && !initData.getURI().getScheme().empty();
+    return keyv::Map::handles( initData.getURI( )) &&
+           !initData.getURI().getScheme().empty();
 }
 
 void CompartmentReportMap::_clear()
diff --git a/brion/plugin/compartmentReportMap.h b/brion/plugin/compartmentReportMap.h
index 351a873..062a06d 100644
--- a/brion/plugin/compartmentReportMap.h
+++ b/brion/plugin/compartmentReportMap.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, EPFL/Blue Brain Project
+/* Copyright (c) 2014-2016, EPFL/Blue Brain Project
  *                          Stefan.Eilemann@epfl.ch
  *
  * This file is part of Brion <https://github.com/BlueBrain/Brion>
@@ -21,14 +21,14 @@
 #define BRION_PLUGIN_COMPARTMENTREPORTMAP
 
 #include "compartmentReportCommon.h"
-#include <lunchbox/persistentMap.h>
 #include <lunchbox/stdExt.h>
+#include <keyv/Map.h>
 
 namespace brion
 {
 namespace plugin
 {
-/** A read/write report using a lunchbox::PersistentMap as backend */
+/** A read/write report using a keyv::Map as backend */
 class CompartmentReportMap : public CompartmentReportCommon
 {
 public:
@@ -77,7 +77,7 @@ class CompartmentReportMap : public CompartmentReportCommon
 
 private:
     URI _uri;
-    lunchbox::PersistentMap _store;
+    keyv::Map _store;
 
     Header _header;
 
diff --git a/doc/Changelog.md b/doc/Changelog.md
index 4980e4a..25ac381 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -1,8 +1,10 @@
 Changelog {#Changelog}
 =========
 
-# Release 1.9.0 (git master)
+# git master
 
+* [110](https://github.com/BlueBrain/Brion/pull/110):
+  Break PersistentMap out into keyv::Map
 * [107](https://github.com/BlueBrain/Brion/pull/107):
   Added Sphinx generated documentation of the brain python module.
 * [102](https://github.com/BlueBrain/Brion/pull/102):