Feature/state cache api enhance