Merge "Revert "Add condition to bypass caching when process uid differs from caller uid."" into main