Begin use of caching
Added caching to items partial
fixed conflicts
Merge pull request #38 from wvmitchell/polishing

Polishing