adding deleting from cache tables
merge changes