Add variant to cache key

Bug: 66621
Change-Id: I8d80dbbb35fa720a778fbf2b6a0248e141900522