Renaming tracing and caching roles

Author: Maulik Patel