Cache-workaround hotfix