2.0 schema cache idempotent

Found when investigating #1585.