MAP-854: Updated sorting and glasspane on caching.