Updated meta/caching system