CC-5555 : Implement simple caching for preferences

comment out logging to not flood logs.
Merge branch '2.5.x'