changed table structure in cache to conform to new standards
fixed conflicts in development branch