Added cache, logging, additional pages