Merge "Do not create the operational/configuration cache if it already exists"