Minor code refactoring.
Added: Paging and search to VPF cache.