cache fix
cache fix
some subscribe improvements and fixes