Maybe the UUID could be stored in the ListenerInvocation object directly?