cleanup on caching logic