Patch 're-enable cache' bug