#918 - Speed up PersistenceManager resolution