Bug fix of page caching