improvement

added a few caching elements