Revert "Add location to pagecache key."

I shouldn't have pushed this up yet. Prerequisite commits aren't in
place. My bad.

This reverts commit 44e4803f412d33b00f9503d7fca43ded32d4a7e8.