BS-11328 - fix form cache