Merge "In AutoLoader, move LC and UserCache to includes/cache section"