Hacky fix for issue with inner classes in .proto files with 'java_mulitple_files' enabled

Testing Done:
Updated test_cache_manager.py. Also fixes the issue with inner object definitions being expected to generate .java files from protoc in our repo.

Reviewed at: https://rbcommons.com/s/twitter/r/303/