WIP: More intelligent cache based on variants