Minor refactoring / reformatting
Removed unused cached page checks which are now contained within the cache.Page module