Fixes and extends cache proxy tests