Cleaned up code and all tests passing
Fixed cache timeouts to be less optimistic.  10 minute local time and 30 minute cassandra time by default.