refactoring in progress
adding a cache lib
testign of the cache lib
killing database that is actually not used much
refactoring in progress
final cleanup in refactoring
Merge branch 'refactoring'