Shear flow over a plane wall with an axisymmetric cavity or a circular orifice of finite thickness