unit cache
minor fixes