Bug - use unique rabl cache keys

Fixes issue #4304 - RABL cache collision for variants