Merge pull request #1389 from brooksryba/projects/jnap

Router cache
Clean up the cache logic
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap