remove cache props
add keychains for keys and states