Fixes in cache support
Update is continued
Inital integration with cache system
Updates for new naming convention
- Naming convention changes - Code cleanup
Cache implementation continued
Initall support of cache
Created branch for caching
Cleanup
Some classes added
