Split BasicKeyValueStore from PersistentKeyValueStore