Fix the secondary super cache problem

While fixing the secondary super cache problem as described here using OptaPlanner as benchmark we found that OptaPlanner is affected by it as well.

To solve it entirely we need to fix it in OptaPlanner