Last patch re #323 was a sledgehammer to crack a walnut. This is a better solution.
Merge pull request #378 from ixc/master

Only doing minimal cache building when registering a content_type.
Merge branch 'master' into next

* master:
  Last patch re #323 was a sledgehammer to crack a walnut. This is a better solution.