Really fix Cache vary matching logic bug.