XD-142 Fix early instantiation of beans in module context