* Use uris for hot reload invalidation. * Clean up unneccessary conversions * add final. * Revert sample change