Start adding external page caching support