Tentatively put an end to all libcache woes. Closes #541