Merge "Revert "Small optimization for recursive calls: avoid dex cache.""