BAC-1241: RL caching policy updated 

BAC-1241: RL caching policy updated

#2880 backported

@prein / @michalroszka / @wladekb