Caller object now the same for all events

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>