Starting to add more sub-cacheing.

In a variety of places, added @chacheit and @user_chachet. All tests seem to
past now.
Further cache changes, all tests pass.
Changed names w/in cache.py