Hotfix, no longer create the cache every time