Rework persistent object retrieval