more state cache work