Issue #75: wired CacheLoader where applicable.

Looks like changes unrelated to the issue at hand. Could they be in their own commit?