Included all relevant permutations in cache manifests (#13799)

Change-Id: I654be9ad344ed92be78befec2b6f495b9561791a