re-enable caching, add cache flushing..