Adding some additional changes including updates to templates (i.e. marking cached articles).