Added caching to improve the performance
Added caching to improve the performance