[NUCODF-50] Change to store using "persistence identity", and fetch as
the most appropriate