More robust retain buffer validity management

2011-03-16, edouard