Change big variant rabl template to have consistent image structure with small variant rabl template. Fix potentially colliding cache keys.

Collab with @jordan-brough