[bitcoin] Merged PR from ajtowns: Revert compact block cache inefficiencies https://github.com/bitcoin/bitcoin/pull/33253