Fix to 3rd level cache key generators and conditions