Merge "Initialize serviceCache before first use" into main