Updates for page cache purposes
simplifying page cache definitions and libraries