Cache is defitely causing problem on Prod ... :(