Add insert tag replacement and remove caching for it