Following upgrade decorated entityManager