Cache proxy update -- rebase to THIS version, guys!