[BUGFIX] Also check if cache files are not empty