replaced filter calls from db to cache