```release-note:bug
cache: revert cache refactor which could cause blocking queries to never return
```