SONAR-5189 Use custom version of persisitit