Performance improvements and clean up in JavacFileManager