#35 GIBS-598 Added new fields to cache XML and cleaned up structure