Merge "Handle type annotations when generating cache keys"
am: 255b001fc2

Change-Id: I6302c2c5104c7e48e7f8be6f59a855044662dba5