Refactoring, caching R-WPS results