fix with temp patch for endless loop from cache issue