Resolving cache call functionality
Revert "Resolving cache call functionality"

This reverts commit eecf8121a32815b37c539b2ba2753cebfe7eb43e.