Changes to support new Schema object and cleaning up variables no longer used
Changing cache name to ensure regeneration of schema after drop in replacement