fixed user cache issue, other minor enhancements