Handle type annotations when generating cache keys

Change-Id: I534fd7f099393a611f19e96c7cff2108fa18a934
Fixes: 38323139
Test: ./gradlew test
1 file changed