Item13125: More CGI Changes

No unit test for Page cache.  Missed this.