Issue #97 : remove legacy method
Issue #97 : save stop event to cache