Added caching to the two more resource intensive pages.