Issue #75: wired CacheLoader where applicable.

No reason to have another dev fix something that needs fixed. 
But given your comment, I propose the following:
 1. Isolated commit
 2. test added