Cached source dicts

Added caching of SourceDicts to reduce redundant updating.
Superfluous blank lines generally clutter things up as well.