- Make RuoteStateCacheListener directly implement StateCacheListener interface
 - Delete unused classes