Cavity prevention