Added caching attribute and utility class
Showing uncomitted changes