Updated Cache and CacheSet
Updated ChangeState in Cache