Merge "Revert "Cache DexFile begin and size""