Added case caching for elements