revert part of caching mechanism
added logging
moved methods around