reverting cache tweaks (will move to different branch w/tests)