Also don't add 'final' everywhere. I think that's probably a little overzealous and intrusive.
Ran more conservative cleanup on AtomCache.