change stache_model_variant to be a real type and not a typedef in preparation for ADL trickery.