fixed cache issues and added cdb adapter