Fixed defect not caching an incoming state change