small refactor of page cache, and #983
Merge branch 'master' of github.com:GetSimpleCMS/GetSimpleCMS