Working on caching. Pretty happy with the results, so far. :-) See #434