[BUGFIX] Fix issue with cache