HOTFIX for cache error