Fixed a bug I introduced (I think it was me)
Removed the contex parameters from cache