Internal cache update issue fix