Partially revert r1093983: caching.c was not meant to be committed.
Partially revert r1093983: caching.c was not meant to be committed.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion