Added caching feature #11