Added Overrides for methods implementing an interface.
- The cache interface has only one implementation. Drop the interface; we can add it back later if necessary. - The DefaultTypeAdapters class contains one member class. Just make that a top-level class.