cleaned up caching controller