Jan Mühlnikel
moved caching into one function
530c653