Remove unnecessary Caching structure.
Minor cleanups in test