cache page types to avoid lots of globs
Merge branch 'page_type_cache' into v7

* page_type_cache:
  cache page types to avoid lots of globs