minor cosmetic changes
restored cache usage