Update to new tokencache namespace.