Merge pull request #1390 from brooksryba/projects/jnap

Cleaning up cache logic
Table update
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap