Speeding up query. Fixed some router things
Merge pull request #1388 from ahomatthew/projects/jnap

Projects/jnap
Making router cache work
Merge
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
Merge pull request #1390 from brooksryba/projects/jnap

Cleaning up cache logic
Resolves JNAPC-279