caching improvement

added more caching elements
improved caching architecture
remove classes that have been migrated over to caching version
cleanup unused files