We can merge this method in to get started if you like, but I don't think it's the right way to go longer term. It adds a (3rd!) lookup mechanism for this - and one based on partial guid matching as string.

There should only be one of these maps, and it should be stable and tested.