Merge pull request #1479 from srtfisher/develop

A TTL of 0 will keep the cache persistant.