Merge "Don't be so agressive in quering the code cache for new methods" into nyc-dev