Cleaned up caching class