There's a problem with this change, as we are no longer performing type/provider validation of the catalog before caching it.
Merged to 6.x in https://github.com/puppetlabs/puppet/commit/c19368514167926332ba6cc5445fea43016b6ce3 and https://github.com/puppetlabs/puppet/commit/376d0aa36235f9401e82655280308d46adca2b48
Passed CI in 95ee1226