Tweak persistentstore cache mechanism
Reshape JUnit tests