add support for state cache callback removal on timeout