Merge "Improve performance of generations in the resource cache" into udc-dev