Really fix retrieval of stale context data upon MODIFIED events