Fix keypath cache