Cached source dicts

Added caching of SourceDicts to reduce redundant updating.