more fixes and improvements to branches related caches

Pierre-Yves Davidrequested to merge
topic/default/bm3.prepare into branch/default

Merge request reports