Vary cache based on CB by default

Please have a look

@federico-lox 
@gabrys