Case 3657 - Added cache, small optimizations.
Case 3657 - Small fix of page number.
Merge branch 'case-3657' into develop

* case-3657:
  Case 3657 - Small fix of page number.
  Case 3657 - Added cache, small optimizations.