Updating cache paths
Fixing per-page sorting