core: fixing findbugs errors

* fixing wrong caching
* no refernce to field

Change-Id: Iad6f990d93bfdc5bfbd7179cffee4893ef40ccc5
Signed-off-by: Gilad Chaplik <gchaplik@redhat.com>