Improved caching
Added TODO in README.'