BABIEL-67 : fix cache issue