DB Fixes + recaching cached objects fixed
Merge branch 'test' of github.com:kellyelton/OCTGN into test