Fixing Overzealous Caching

We should not cache the entire page output, we need to allow caching on
a case by case basis.