I think the information we keep in the store needs to distinguish the different handler methods somehow. Options that spring to mind are storing an additional key (e.g. ``type`` or ``handler``) in each object in the store OR having sub-stores for each handler (I think I like the latter more).