Removed everything related to caching. Caching will be the responsibility of CSA and (perhaps) Cruncher