hotfix: only use cache when necessary