Remove caching for elements (for now)