Fixing cache key being stored for 2 then used for 3