Playing with cache, fixing names and single-instance annoyances