Adding cache for bundle and trace