FELIX-5669 : Registering a PersistenceManager causes duplicate caches. Apply modified patch from Brandan Jeter