bkelly & nsm cache and fetch patches imported from Github

--HG--
extra : amend_source : 26786daa0aedbfe330a0dee1eda63c65071adeb8