Fix cache key; This should take the params into account