Callcontext store persistence fix