Hotfix Cache configuration