Simpler peer cache management (fixed weird issues).