Resolve FIXME and prevent accidental matching of PluginReplySender across restart of plugins