Updates to fix hash collision between provided and created source objects.  These need slightly different mapping definitions cached.