[BUGFIX] Fix "Invalid cache entry identifier"