Don't store values in Identifiables

Extract the unique Id and store it, rather than
keeping the whole entity around.