add tests for caching
Merge branch 'master' of github.com:sontek/notaliens.com into cache_tests
cleaned up the cache tests a bit