Merge "Don't wait on lock in getClassLoader if already cached." into main