ENHANCEMENT - moves caching to a new class with a sharedInstance.